etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,905 Commits 323 Branches 325 Tags 845 MiB
Commit Graph

25905 Commits

Author SHA1 Message Date
Sudhansu 0347b2f5f3 CLOUDSTACK-7986 [F5 LB] Failed to execute IPAssocCommand due to com.cloud.utils.exception.ExecutionException: Exception caught in Networking::urn:iControl:Networking/VLAN::create() 
added 3 new method to strip partition information from VirtualServer, LBPool, VLAN api response.

With BigIP V11.x VirtualServer, LBPool, VLAN api response has been modified.
Now BigIP returns resource  name with user partition information
ex: if vlanname is vlan-100 then the get_list() will return /Common/vlan-100 (/Common -> Suer portition)
This method will strip the partition information and only returns a list with vlan name (vlan-100)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-12-08 15:46:58 +05:30
Rajani Karuturi b61733d040 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2014-12-08 15:28:41 +05:30
Rajani Karuturi 4722fa3de9 Merge branch '4.5' 
Conflicts:
	client/WEB-INF/classes/resources/messages_ja_JP.properties
	client/WEB-INF/classes/resources/messages_zh_CN.properties
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	engine/schema/src/com/cloud/upgrade/dao/Upgrade442to450.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/event-bus/rabbitmq/pom.xml
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/VolumeApiServiceImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	setup/db/db/schema-442to450.sql
	test/integration/component/test_persistent_networks.py

This closes #53
 2014-12-08 15:27:53 +05:30
Rohit Yadav eb666453f3 CLOUDSTACK-6212: auto_increment for some other resource tables 
This fix alters table columns which are primary keys but don't have them
auto_increment such as region, domain_router, user_vm etc.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a11ddf3077)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-08 14:48:04 +05:30
Rohit Yadav a60d232d07 CLOUDSTACK-6212: Let vm_instance table's ID field be unique and auto_increment 
`vm_instance` table's id column is unique but does not auto_increment like other
resource tables. The fix simply alter the table's id column to have it
auto_increment which may avoid id conflicts in a multi-master mysql setup.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e1e5e12aaa)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-08 14:47:58 +05:30
Rohit Yadav 57a210ede9 Merge branch 'hotfix/CLOUDSTACK-6212' into 4.5 
This closes #52

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-08 14:46:23 +05:30
Jayapal 8f8e311110 CLOUDSTACK-8030: Updated router to come up egress default ALLOW 
On default iptables rules are updated to add ACCEPT egress traffic.
    If the network egress default policy is false, CS remove ACCEPT and adds the DROP rule which
    is egress default rule when there are no other egress rules.

    If the CS network egress default policy is true, CS won't configure any default rule for egress because
    router already came up to accept egress traffic. If there are already egress rules for network then the
    egress rules get applied on VR.

    For isolated network with out firewall service, VR default allows egress traffic (guestnetwork --> public network)
 2014-12-08 11:32:01 +05:30
Nitin Mehta b1e4c6db07 Revert "Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured."" 
This reverts commit 24aaf19239.
 2014-12-08 11:20:49 +05:30
Rohit Yadav a11ddf3077 CLOUDSTACK-6212: auto_increment for some other resource tables 
This fix alters table columns which are primary keys but don't have them
auto_increment such as region, domain_router, user_vm etc.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-06 06:26:31 +05:30
Jessica Wang 7e0f1cf457 CLOUDSTACK-8040: UI: register template dialog, register ISO dialog - fix a bug that hidden fields fail to be generated before cloudStack.preFilter.createTemplate() is called. Thus, cloudStack.preFilter.createTemplate() is unable to change hidden fields's css display property from none to inline-block for admin users. 2014-12-05 16:49:13 -08:00
Jessica Wang 3ddf553d16 CLOUDSTACK-8040: UI: register template dialog, register ISO dialog - fix a bug that hidden fields fail to be generated before cloudStack.preFilter.createTemplate() is called. Thus, cloudStack.preFilter.createTemplate() is unable to change hidden fields's css display property from none to inline-block for admin users. 2014-12-05 16:47:34 -08:00
Rohit Yadav e1e5e12aaa CLOUDSTACK-6212: Let vm_instance table's ID field be unique and auto_increment 
`vm_instance` table's id column is unique but does not auto_increment like other
resource tables. The fix simply alter the table's id column to have it
auto_increment which may avoid id conflicts in a multi-master mysql setup.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-06 05:54:39 +05:30
Jessica Wang 7d7df0245b CLOUDSTACK-8039: UI > Infrastructure > router, systemvm > detailView > hide ChangeServiceOffering action when vm's hypervisor is XenServer and vm's status is Running. 2014-12-05 14:41:55 -08:00
Jessica Wang 4f748e6e30 CLOUDSTACK-8039: UI > Infrastructure > router, systemvm > detailView > hide ChangeServiceOffering action when vm's hypervisor is XenServer and vm's status is Running. 2014-12-05 14:40:21 -08:00
Vincent Bernat 3ea8a1187a CLOUDSTACK-7195: log wide exceptions in security_group.py 
Some try/except in security_group.py catch a lot of exceptions. There
was already one fixed in CLOUDSTACK-1052. Here is another one. We use
logging.exception() to log those exceptions.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org>
 2014-12-05 17:24:27 -05:00
Rohit Yadav b3416f4a5e pr: close invalid, or non-applicable Github PRs 
PR #1 -> too old to merge 4.2 on master now
PR #4 -> too old to merge 4.3 on master now
PR #5 -> source repo/branch deleted, not available now

This closes #1
This closes #4
This closes #5

This is an empty git commit.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-05 23:05:01 +05:30
Rohit Yadav c53e1b648b Merge remote-tracking branch 'laszlo/packaging_1' 
This closes #51

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-05 22:51:37 +05:30
Gaurav Aradhye ca52f15530 CLOUDSTACK-8021: Change test cases to use host information from configurableData section in test_data.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 20:13:27 +05:30
Gaurav Aradhye 7c951a2fa9 CLOUDSTACK-8018: Improve code quality - test_redundant_router.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 19:51:13 +05:30
Sheng Yang ddf6fd2f9a CLOUDSTACK-7436: Fix automation test on RvR status detection 
Everytime when checking the RvR status, you must wait some time for RvR to
update it's status. The polling thread would update the status only every 30
seconds by default.
 2014-12-05 19:51:04 +05:30
Wei Zhou 18b230db74 Revert "Occasionally the while loop can exit with no data (Probably recieving an EOF) before receiveing CMDline data from the certial port. Continue looping until cmdline is populated" 
This reverts commit 83656a6ea8.

The systemvm/routers will reboot automatically if the systemvm.iso changes.
They will stuck during the startup due to this commit because the virtio-port are empty.
 2014-12-05 15:17:55 +01:00
Gaurav Aradhye 100e46bf4e CLOUDSTACK-8018: Improve code quality - test_redundant_router.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 18:40:23 +05:30
Gaurav Aradhye 84aaef25d9 CLOUDSTACK-8029: Remove unused kaypairs from test_data.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 18:37:32 +05:30
Gaurav Aradhye 6020053110 CLOUDSTACK-8028: Fix test_data.py - Separate virtual_machine dict having userdata key 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 18:37:22 +05:30
Gaurav Aradhye 8d5ce97edc CLOUDSTACK-8029: Remove unused kaypairs from test_data.py 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 18:36:19 +05:30
Gaurav Aradhye a72b6a7f99 CLOUDSTACK-8028: Fix test_data.py - Separate virtual_machine dict having userdata key 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 18:36:19 +05:30
Nitin Mehta 24aaf19239 Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured." 
This reverts commit 39a671dfd8.
 2014-12-05 15:24:09 +05:30
Wei Zhou 131dca84dd [UI] bug fix: vpn configuration does not show/update ipsec pre-shared key 2014-12-05 09:13:28 +01:00
Wei Zhou 2554cfb140 CLOUDSTACK-7847: Can't deploy in project using customer created compute offerings 2014-12-05 08:42:22 +01:00
Jayapal 2d7f0c693b CLOUDSTACK-8027: Update error msg for enable static nat 2014-12-05 12:55:41 +05:30
Jayapal 936a17be22 CLOUDSTACK-8027: Update error msg for enable static nat 2014-12-05 12:45:22 +05:30
Gaurav Aradhye d5370a95d2 CLOUDSTACK-8002: test_high_availability.py - Skip test cases if enough hosts are not available 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 11:19:03 +05:30
Gaurav Aradhye a6fd3190c0 CLOUDSTACK-8003: test_egress_fw_rules.py - Remove test case dependency on each other and improve cleanup code 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 11:18:54 +05:30
Gaurav Aradhye fe0a55fb57 CLOUDSTACK-8003: test_egress_fw_rules.py - Remove test case dependency on each other and improve cleanup code 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 11:18:19 +05:30
Gaurav Aradhye 6f046bd1ab CLOUDSTACK-8002: test_high_availability.py - Skip test cases if enough hosts are not available 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
 2014-12-05 11:18:19 +05:30
Jessica Wang 774394792e CLOUDSTACK-8023: UI > VM wizard > service offering > trigger event handler of event "cloudStack.module.instanceWizard.serviceOffering.dataProvider" to get serviceOfferingObjs if module is enabled. 2014-12-04 16:26:41 -08:00
Brian Federle 8927975ca9 LB VM select: Fix issue with adding primary NIC IP 2014-12-04 13:44:57 -08:00
Brian Federle 1394bcb682 ja_JP: Quickview: Use smaller font size for action items 2014-12-04 13:23:25 -08:00
Brian Federle 57ae7dfbeb Security groups: Prevent wrapping on account/SG text fields 2014-12-04 13:08:57 -08:00
Mihaela Stoica a07938752a CLOUDSTACK-8010: [UI] Fixed unlocalized string "label.add.private.gateway" 2014-12-04 12:55:46 -08:00
vetrivelc 9ce8a1cd00 Fixed label issue and externalized hardcoding issues 
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
 2014-12-04 11:28:44 -08:00
Chandan Purushothama 41b871b6bd CLOUDSTACK-8007: Fixed the script 'test_vm_passwdenabled.py' - Template created by Admin should have public access to be used for regular User VM Deployment 2014-12-04 13:01:25 -08:00
Laszlo Hornyak 6b058b0203 removed -o|--operating-system from the package.sh help text 
it does not handle the arguments, it warns for unknown option when using it

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-12-04 18:22:32 +01:00
Laszlo Hornyak 2fc3883ac0 syntax fix for packaging OSS 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-12-04 18:22:19 +01:00
Damodar 7ef0f5507d Attach volume events are not correctly shown in events. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-12-04 20:01:41 +05:30
Wei Zhou fc1a09ff49 Add snapshotName parameter in CreateSnapshotCmd 2014-12-04 15:29:39 +01:00
Wei Zhou 4608053ed7 [UI] bug fix: the host uuid is wrong if it is dedicated to a domain 2014-12-04 15:28:57 +01:00
Wei Zhou d4605556c6 fix NPE when delete a domain 2014-12-04 15:28:41 +01:00
Rohit Yadav bf88be5b25 Revert "CLOUDSTACK-8011: Upgrade maven dependencies" 
This reverts commit 482815d084.
 2014-12-04 19:47:23 +05:30
Rohit Yadav 752980f370 Revert "packaging: updated hardcoded jasypt version to 1.9.2" 
This reverts commit 43f39a1ec3.
 2014-12-04 19:47:10 +05:30