14015 Commits

Author SHA1 Message Date
Jessica Wang
ff8fccccb2 CS-16326: cloudstack UI - instance page - listView - (1) the column that maps to name property in API response is labelled as "Name" instead of "Host Name".
(2) add back Internal Name column for root-admin.
2012-10-16 10:01:15 -07:00
David Nalley
33ed37d877 converting messages_ru_RU.properties to UTF (thanks to jzb for the help) CLOUDSTACK-349 2012-10-15 23:57:44 -04:00
Alena Prokharchyk
3f5733cea7 CS-16412: fixed count for following commands:
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes

Conflicts:

	api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
	api/src/com/cloud/api/commands/ListConditionsCmd.java
	api/src/com/cloud/api/commands/ListCountersCmd.java
	api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
	api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
	api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
	api/src/com/cloud/network/as/AutoScaleService.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/as/dao/CounterDao.java
	server/src/com/cloud/network/as/dao/CounterDaoImpl.java
	server/src/com/cloud/projects/ProjectManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
2012-10-15 18:16:59 -07:00
Brian Federle
f72434261c CLOUDSTACK-352: Fix user dashboard VM count
Pass listAll=true to user dashboard API call, so domain admin can see totals
for all user VMs.
2012-10-15 14:23:42 -07:00
Alena Prokharchyk
1d458c7a2d CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin 2012-10-15 11:39:38 -07:00
Brian Federle
7e704d1b3d Fade-in notification widget on show 2012-10-15 10:05:24 -07:00
Hugo Trippaers
2d48ce45a8 Add the systemvm.iso to the client webapp 2012-10-15 17:51:05 +02:00
Hugo Trippaers
11dc1f0b8e Check manageontap sdk version and provide instructions. 2012-10-15 17:25:40 +02:00
Hugo Trippaers
3bb136292b Double check vmware dependencies and provide information on where to get
them.
2012-10-15 16:57:59 +02:00
Rohit Yadav
9b1b145192 CLOUDSTACK-346: Replace vmware-lib-jaxrpc with axis-jaxrpc
vmware-lib-jaxrpc is now provided by axis-jaxrpc-1.4.jar, the former is
the same as latter (bit by bit) and only difference is the file name.

- Fix dependency in vmware-base's pom.xml
- Fix dependency in hypervisor-plugin-vmware's pom.xml
- Fix install-non-oss.sh by reverting commit:
    2e6ddc6c36f4ce79e67ad223647071bccfc41c52.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-15 16:44:30 +05:30
Hugo Trippaers
a4a3194899 Fix license headers 2012-10-15 10:22:12 +02:00
Rohit Yadav
4c69cac42e CLOUDSTACK-341: Fix incorrect js object in system.js
Use correct object in system.js that fixes the issue of management traffic
details not getting loaded as it fails on type error.

Fixes regression introduced in 95b6a5eeda73beeb97fe8dd229c880c97668d44f
2012-10-14 20:53:18 +05:30
Edison Su
7f104b1feb [PATCH] CLOUDSTACK-335: fix lb for vpc on kvm 2012-10-12 18:58:46 -07:00
Jessica Wang
08b074a101 CS-16493: cloudstack UI - IP Address page - hide VLAN for regular-user/domain-admin. 2012-10-12 15:22:15 -07:00
Jessica Wang
318a60fd6a CS-16493: cloudstack UI - guest network page - hide VLAN ID for regular-user/domain-admin. 2012-10-12 14:50:55 -07:00
frank
23495c7e26 CloudStack CS-15455 There are no iptable rules configured to open awsapi port (7080) for external world.
resolved fixed

reviewed-by:edison
2012-10-12 14:13:13 -07:00
Jessica Wang
7cac7ff2c7 cloudstack UI - left navigation - group menus for the same role. 2012-10-12 14:06:55 -07:00
Alena Prokharchyk
8f2d9a09e5 CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands
Fixes the count in commands:

listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes

Conflicts:

	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2012-10-12 13:58:59 -07:00
Chip Childers
6e60a07566 CLOUDSTACK-326: Corrected marvin license file to be full ASLv2 license text
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 16:41:17 -04:00
Chip Childers
6151a29949 CLOUDSTACK-326: Combining Marvin Sandbox README with README.tools.md
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 16:11:17 -04:00
Chip Childers
a82761dfe3 Removed KEYS file copy operation from the source build script.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 15:38:52 -04:00
Chip Childers
c45c1b0542 Removing KEYS file, since this is apparently not supposed to be in source control.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 15:34:54 -04:00
Chip Childers
b48d0d7d08 CLOUDSTACK-326: Removing extra license and README files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 14:29:51 -04:00
Chip Childers
8c31af0e1c Source build modified to produce *.tar.bz2 instead of *.tar.gz
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 14:06:53 -04:00
Chip Childers
24978eed59 CLOUDSTACK-331: Added legal docs for ui/lib/excanvas.js
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 12:36:43 -04:00
David Nalley
ffb5c80a6b fixing deb and rpm builds from source tarballs 2012-10-12 12:31:31 -04:00
Chip Childers
806d033fe3 CLOUDSTACK-330: Correct Citrix information to be Apache in several .py files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 12:18:56 -04:00
Chip Childers
7090c10311 CLOUDSTACK-327: Correcting license header
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 11:59:33 -04:00
Chip Childers
9c89e44963 CLOUDSTACK-326: Removing unneeded legal doc files
I'm removing the awsapi/README.txt file, since it's
not required at all, and is actually from Axis.

I'm also removing the deps/XenServerJava/LICENSE.txt
and README.txt files, since the license is covered
by our top level LICENSE and the README.txt is
not for our project itself.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 11:10:13 -04:00
Chip Childers
578bca08cb Dropping .zip archive format from the source build
This is due to the nature of ASF release votes,
and the desire to see each individual artifact be tested.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-12 11:08:12 -04:00
Hugo Trippaers
c07d6d28ee Merge branch 'nicira-l3support'
This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding

Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules

Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended)
2012-10-12 14:15:17 +02:00
Prasanna Santhanam
c86c5d2cc0 Uniting all the READMEs from tools and test
There are various READMEs under Cloudstack. This makes it confusing for
finding the purpose of each directory and tool within the project. All
the necessary information can now be found in the top-level README.tools
that is markdown editable. For the most updated information however it
is best to provide a wiki link to the tool you have added. Each tool
lies in a seperate section, please keep formatting unchanged.
2012-10-12 17:01:20 +05:30
Prasanna Santhanam
780468659f uniting the READMEs
Many READMEs spread over the integration and marvin test related
information can now be found in the single top-level directory
2012-10-12 16:07:03 +05:30
Hugo Trippaers
51f9a98871 Check all TODO and FIXME tasks 2012-10-12 12:02:54 +02:00
Hugo Trippaers
ab8ba3d61d Implement the portforwarding code in the resource
Fix a small naming typo
2012-10-12 11:57:27 +02:00
Prasanna Santhanam
d1e260032f Python style error because of extraneous characters
Presence of Non-ASCII characters caused compilation errors.
2012-10-12 15:27:13 +05:30
Edison Su
513b680d96 CLOUDSTACK-316: if public network is not specified, set to guest network 2012-10-11 16:46:23 -07:00
Jessica Wang
e73cbfe6a9 CS-16344: cloudstack UI - multiEdit widget - remove isOptional property, isDisabled property from field level since they are supposed to be on field.range level. 2012-10-11 14:07:03 -07:00
Chip Childers
fde4fee5d7 Edited release notes to refer to 4.0 as 4.0.0-incubating. 2012-10-11 16:55:31 -04:00
Radhika PC
713599723b Fix for CLOUDSTACK-302 (New Features Are Added to ReleaseNotes)
Added the following new features to ASFCS 4.0 Release Note:
CLVM support reappeared for KVM
RBD support for KVM
Nicira NVP support
Caringo object storage support

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-11 16:50:53 -04:00
Brian Federle
ea934c1a02 Update advanced search styling
- Add cancel button

- Move search buttons to the right
2012-10-11 13:27:07 -07:00
Ilya Musayev, CloudSand.com
77ba46e322 CLOUDSTACK-321: Fixed a bug in cloud-set-guest-*.in
Fixed a bug in cloud-set-guest-sshkey.in to properly check the
SSHKEY_SERVER_IP variable
2012-10-12 01:20:15 +05:30
Brian Federle
44996d4611 Style advanced search
-Convert advanced search to a drop-down that overlaps the standard
 search when visible

-Add new arrow icon to show advanced search popup
2012-10-11 12:13:55 -07:00
Edison Su
2c2afda062 jetty:run should use ${project.build.directory}/${project.build.finalName} directory 2012-10-11 12:08:28 -07:00
Hugo Trippaers
553a72047f Implement static nat handling 2012-10-11 18:13:47 +02:00
Rohit Yadav
6dd5c3fd42 CLOUDSTACK-70: Improve restart network behaviour for basic network
If cleanup=true, network elements and resources are shutdown and
reimplemented. Else, shutdown/reimplementation is skipped. Enabled
cleanup checkbox in CS UI.

For both cases, VRs are only deployed for Pods with no running
or starting VRs and Pods having running or starting user vms.

New DAO helpers introduced:
HostPodDao: listByDataCenterIdVMTypeAndStates
DomainRouterDao: listByPodId and listByPodIdAndStates
VMInstanceDao: listByPodId and corrected definition of listByTypeAndState

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 19:33:26 +05:30
David Nalley
eac941d590 fixing license header for test_allocation_states.py CLOUDSTACK-314 2012-10-11 08:05:41 -04:00
Rohit Yadav
16fa74b729 Revert "core: Comment testSourceDirectory in pom.xml to fix build"
Had unclean git repo, from switching between 4.0 and master.
This reverts commit c3f9a9b748dba73f0f02a8f93f7c80300b50d6d5.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 17:12:20 +05:30
Rohit Yadav
c3f9a9b748 core: Comment testSourceDirectory in pom.xml to fix build
A clean build is breaking due to testSourceDirectory being enabled. The
tests in core/test/com/cloud/hypervisor/vmware/ depend on vmware nonoss
libs and utils's test classes.

The issue here is that core's test classes depend on utils's test
classes.

Commenting testSourceDirectory for now.

The following patch should be added when this issue is fixed, only if
VMWare related tests are moved from core/test:

+  <profiles>
+    <profile>
+      <id>vmware</id>
+      <activation>
+        <property>
+          <name>nonoss</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.cloud.com.vmware</groupId>
+          <artifactId>vmware-vim</artifactId>
+          <version>1.0</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.cloud.com.vmware</groupId>
+          <artifactId>vmware-vim25</artifactId>
+          <version>1.0</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.cloud.com.vmware</groupId>
+          <artifactId>vmware-apputils</artifactId>
+          <version>1.0</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.cloud.com.vmware</groupId>
+          <artifactId>vmware-lib-jaxrpc</artifactId>
+          <version>1.0</version>
+          <scope>runtime</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.cloudstack</groupId>
+          <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
+          <version>${project.version}</version>
+          <exclusions>
+            <exclusion>
+              <groupId>org.apache.cloudstack</groupId>
+              <artifactId>cloud-core</artifactId>
+            </exclusion>
+         </exclusions>
+        </dependency>
+     </dependencies>
+    </profile>
+  </profiles>

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 15:47:36 +05:30
Rohit Yadav
2e6ddc6c36 install-non-oss: mvn install file vmware-lib-jaxrpc.jar
installing nonoss libs to ~/.m2 should include vmware-lib-jaxrpc jar

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 15:03:34 +05:30