wilderrodrigues
c1b0900b89
Merge branch 'feature/vpc-ipv6' of https://github.com/schubergphilis/cloudstack into feature/vpc-ipv6
...
Getting latest from the Schuberg Philis VPC-IPv6 work
2015-06-10 22:35:35 +02:00
wilderrodrigues
fd1868504e
Merge branch 'feature/vpc-ipv6' of github.com:schubergphilis/cloudstack into feature/vpc-ipv6
...
Rebasing with Master.
- We still had a conflict in the database upgrade file 451to460
2015-06-10 22:20:29 +02:00
Suresh Ramamurthy
c198d44afd
Enhanced Zone API to support Ipv6 attributes like IPv6 Super CIDR and ASN
2015-06-10 22:19:48 +02:00
Suresh Ramamurthy
277964e454
Modified VPC, Zone schema and VO files to add IPv6 attributes
2015-06-10 22:19:48 +02:00
Suresh Ramamurthy
9cac92673e
Size of ipv6 CIDR and asNumber fields are reduced to reflect their actual size
2015-06-10 22:16:25 +02:00
Suresh Ramamurthy
f19f4c8de5
Modified VPC, Zone schema and VO files to add IPv6 attributes
2015-06-10 22:16:25 +02:00
Ian Southam
7ba2f2274a
Allow test to run on tiny linux templates using busybox
...
Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>
This closes #381
2015-06-10 22:00:54 +02:00
Sanjeev Neelarapu
de6538c9e7
SKIP vm migration tests on LXC since it is not a supported hypervisor
...
This closes #383
2015-06-10 17:29:18 +05:30
Gaurav Aradhye
54a664730d
CLOUDSTACK-8515: Skipping snapshot test cases on HyperV and LXC
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #376
2015-06-10 16:11:34 +05:30
Gaurav Aradhye
e3cfe89053
CLOUDSTACK-8546: Correcting skip test code in testpath_vMotion_vmware.py
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #377
2015-06-10 16:04:10 +05:30
pritisarap12
84bc2e6127
CLOUDSTACK-8549: Update assert statements in testpath_disable_enable_zone.py
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #382
2015-06-10 15:59:45 +05:30
wilderrodrigues
3b91964465
Merge branch 'merge/feature-vpc-ipv6' into feature/vpc-ipv6
...
This closes #3
2015-06-10 09:07:30 +02:00
Sateesh Chodapuneedi
5e41a830a5
This closes #373
...
CLOUDSTACK-3317 - DVS does not support management\storage network
Added support for Management and Storage Network traffic over VMware DVS in CloudStack deployments. Also added support for storage VLAN over dvPortGroup.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
CLOUDSTACK-3317 - DVS does not support management\storage network
Use non-zero dvport count while updating dvportgroups of system traffic.
Updated configuration compare logic to avoid update dvportgroup operation unless required.
This would help improve speed in vm/network deployment as the update calls would reduce. Also improved logging.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
Adding unit tests in class HypervisorHostHelperTest
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
Added license header to new file being added to repo/branch.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2015-06-10 02:07:40 +05:30
Sanjeev Neelarapu
8f1e0510cd
Skipping all unsupported tests on LXC
...
This closes #379
2015-06-10 13:47:28 +05:30
Suresh Ramamurthy
eb6c990b1a
Enhanced Zone API to support Ipv6 attributes like IPv6 Super CIDR and ASN
2015-06-09 04:46:21 -04:00
Suresh Ramamurthy
13cef9a7cb
Rebase with master of SBP
2015-06-09 04:44:25 -04:00
Suresh Ramamurthy
78bc96eb2c
Modified VPC, Zone schema and VO files to add IPv6 attributes
2015-06-09 04:41:01 -04:00
Suresh Ramamurthy
ed94d95d09
Size of ipv6 CIDR and asNumber fields are reduced to reflect their actual size
2015-06-09 04:39:05 -04:00
Suresh Ramamurthy
2766c81a99
Modified VPC, Zone schema and VO files to add IPv6 attributes
2015-06-09 04:39:04 -04:00
wilderrodrigues
873cbddb9f
Merge branch 'feature/vpc-ipv6' of https://github.com/schubergphilis/cloudstack into feature/vpc-ipv6
...
This closes #371
2015-06-08 16:09:37 +02:00
Gaurav Aradhye
6140db50b3
CLOUDSTACK-8542: Correcting test case in test_vpc_on_host_maintenance.py
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #360
2015-06-08 13:37:37 +05:30
Daan Hoogland
b272d7717e
Revert "Fix 2 findbugs high priority warnings"
...
This reverts commit 1ca74dac26 .
2015-06-08 10:01:19 +02:00
Rafael da Fonseca
c5437d216f
Fix malformed closing tag on comments in cisco .xml files
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #369
2015-06-08 09:41:13 +02:00
Rafael da Fonseca
b9b13d764d
Fix another case of unnecessary boxing JuniperSrxResource.java:1280, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High Boxing/unboxing to parse a primitive com.cloud.network.resource.JuniperSrxResource.removeDestinationNatRules(Long, Map, List)
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #367
2015-06-08 09:41:07 +02:00
Rafael da Fonseca
039d632ad3
Fix 3 more findbugs performance alerts, creating Long and Integer unnecessarily F5BigIpResource.java:297, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High F5BigIpResource.java:703, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High F5BigIpResource.java:889, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High Boxing/unboxing to parse a primitive com.cloud.network.resource.F5BigIpResource
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #366
2015-06-08 09:40:59 +02:00
Rafael da Fonseca
e8c7069f73
Fix findbugs high priority warning VmwareStorageManagerImpl.java:1023, RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE, Priority: High Redundant nullcheck of datastoreVolumePath, which is known to be non-null in com.cloud.hypervisor.vmware.manager.VmwareStorageManagerImpl.getVolumePathInDatastore(DatastoreMO, String)
...
Assertion is not used in runtime, correct way is throw and handle exception without killing app
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #362
2015-06-08 09:40:50 +02:00
Rafael da Fonseca
9bac84a3f7
Fix last ocurrence of unnecessary boxing detected by findbugs CiscoVnmcResource.java:266, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High Boxing/unboxing to parse a primitive com.cloud.network.resource.CiscoVnmcResource.getIpRangeFromCidr(String)
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #368
2015-06-08 09:39:02 +02:00
Rafael da Fonseca
38c269d71e
Fix performance issue reported by findbugs (unnescessary boxing/unboxing) VmwareResource.java:693, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High VmwareResource.java:4769, DM_BOXED_PRIMITIVE_FOR_PARSING, Priority: High Boxing/unboxing to parse a primitive com.cloud.hypervisor.vmware.resource.VmwareResource.getNetworkStats(String)
...
Now op is faster and takes up less memory
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #365
2015-06-08 09:32:52 +02:00
Rafael da Fonseca
65383fb8fa
Fix another findbugs high priority warning JuniperSrxResource.java:2617, ES_COMPARING_STRINGS_WITH_EQ, Priority: High Comparison of String objects using == or != in com.cloud.network.resource.JuniperSrxResource.manageApplication(JuniperSrxResource$SecurityPolicyType, JuniperSrxResource$SrxCommand, JuniperSrxResource$Protocol, int, int)
...
This now correctly compares strings
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #364
2015-06-08 09:30:38 +02:00
Rafael da Fonseca
1ca74dac26
Fix 2 findbugs high priority warnings
...
VmwareResource.java:315, MS_SHOULD_BE_FINAL, Priority: High
com.cloud.hypervisor.vmware.resource.VmwareResource.s_serviceContext isn't final but should be
VmwareResource.java:331, MS_SHOULD_BE_FINAL, Priority: High
com.cloud.hypervisor.vmware.resource.VmwareResource.s_powerStatesTable isn't final but should be
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #363
2015-06-08 09:24:07 +02:00
jeff
db69c8e82b
Allow PropertiesUtil to read from jar files.
...
PropertiesUtil has code for reading from jar files, but the
findConfigFile method will prevent it from ever returning a file in a
jar on the classpath since it always wants to have a "file:" URL and
use the File class.
This commit moves the jar file loading attempt from a catch block to
an else clause, executed if a config file:// URL could not be found.
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #358
2015-06-08 09:19:21 +02:00
pritisarap12
0326fb3b5c
CLOUDSTACK-8308: Updating Disable/enable host testpath as admin user should not be able to deploy vm on disabled host
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #356
2015-06-05 14:08:56 +05:30
wilderrodrigues
f2d24cf7a1
Merge branch 'feature/vpc-ipv6' of github.com:schubergphilis/cloudstack into feature/vpc-ipv6
...
Rebasing feature/vpc-ipv6 with latest master
2015-06-05 07:46:18 +02:00
Suresh Ramamurthy
4d799d5e13
Size of ipv6 CIDR and asNumber fields are reduced to reflect their actual size
2015-06-05 07:45:58 +02:00
Suresh Ramamurthy
a5748fb055
Modified VPC, Zone schema and VO files to add IPv6 attributes
2015-06-05 07:45:57 +02:00
Wilder Rodrigues
ee1064171d
Merge pull request #2 from sureshr-hasvik/feature/vpc-ipv6
...
Modified VPC, Zone schema and VO files to add IPv6 attributes
LGTM. The changes I suggested were applied and the choice for asNumber being a String was explained.
Merging...
2015-06-05 07:42:06 +02:00
Suresh Ramamurthy
49418223d5
Size of ipv6 CIDR and asNumber fields are reduced to reflect their actual size
2015-06-04 10:08:14 -07:00
wilderrodrigues
93845afd53
Using a try-wioth resrouce block as suggested in @DaanHoogland review.
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #355
2015-06-04 12:34:05 +02:00
wilderrodrigues
7f4e2c7cf0
Renaming the variable from "s" to "script"
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:05 +02:00
wilderrodrigues
6138d9a690
Coverity issue 1116812 - Replacing concatenation with optionsBuffer.append(option.getKey()).append('=').append(option.getValue()).append(',');
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:05 +02:00
wilderrodrigues
9ff38486a1
Coverity issue 1116677 - Avoiding catching only Exception. Makes the code too britle. - Catching the QemuImgException and throwing it to be caught further in the code - Surrounding the output stream with try/catch and throwing it to be further handled in the code. Closing the output stream quietly.
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:05 +02:00
wilderrodrigues
6271663682
Formatting the code - Adding final modifier and indenting the code
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:04 +02:00
wilderrodrigues
c3b4c7a9cf
Coverity issue 1116509 - Assigning the the new returned ResultSet to the rs variable in order to get it closed in the finally block
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:04 +02:00
wilderrodrigues
abe0990259
Formatting the code - Adding final modifier and indenting the code
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:04 +02:00
wilderrodrigues
fe78c76691
Coverity issue: 1012179 - Commenting out unused variable.
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:03 +02:00
wilderrodrigues
159d8c2c97
Formatting the code - Adding final modifier to attributes and indenting the code.
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-06-04 12:34:03 +02:00
Gaurav Aradhye
f92a50363c
CLOUDSTACK-8515: Skipping snapshots tests on HyperV and LXC hypervisors
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #350
2015-06-04 10:56:28 +05:30
Suresh Ramamurthy
e672a88419
Modified VPC, Zone schema and VO files to add IPv6 attributes
2015-06-03 18:00:24 -07:00
Rafael da Fonseca
00884b3b0b
Fixes LB certificate tests failure when the full path has a special character like whitespace or many others.
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #336
2015-06-04 00:11:09 +02:00
Daan Hoogland
3d4d152753
CID 1302976 Scanner in try-with-resource
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #352
2015-06-04 00:09:40 +02:00