----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/15715/#review29211 -----------------------------------------------------------
Commit 631743b44a3cd5e69ff5c1ef6844950bb1074c5c in branch refs/heads/4.2 from Gaurav Aradhye [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=631743b ] CLOUDSTACK-5215: Correcting and refactoring code related to getting free vlan - ASF Subversion and Git Services On Nov. 20, 2013, 10:53 a.m., Gaurav Aradhye wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/15715/ > ----------------------------------------------------------- > > (Updated Nov. 20, 2013, 10:53 a.m.) > > > Review request for cloudstack, Girish Shilamkar and SrikanteswaraRao Talluri. > > > Bugs: CLOUDSTACK-5215 > https://issues.apache.org/jira/browse/CLOUDSTACK-5215 > > > Repository: cloudstack-git > > > Description > ------- > > The function getFreeVlan was used in 3 files separately and it was not > checking whether the vlan id is already in use by any other network. > > Now checking if it is used by any network, else search for another vlan id, > also moved this function to common.py and made respective changes across 3 > files. > > > Diffs > ----- > > test/integration/component/test_shared_networks.py 28468c9 > test/integration/component/test_vpc_vm_life_cycle.py beb5b99 > test/integration/component/test_vpc_vms_deployment.py c4811ed > tools/marvin/marvin/integration/lib/common.py 6c2bb2a > > Diff: https://reviews.apache.org/r/15715/diff/ > > > Testing > ------- > > Tested is the function works correctly. Ran 2 test cases simultaneously which > create multiple shared networks. > > Log: > > Test 1: > ==> result.log <== > test_createSharedNetwork_projectSpecific > (test_shared_networks.TestSharedNetworks) > Test Shared Network with scope project ... skipped 'skip' > test_createSharedNetwork_usedVlan (test_shared_networks.TestSharedNetworks) > Test Shared Network with used vlan 01 ... skipped 'skipped - This is a > redundant case and also this is causing issue for rest fo the cases ' > test_createSharedNetwork_usedVlan2 (test_shared_networks.TestSharedNetworks) > Test Shared Network with used vlan 02 ... skipped 'skip' > test_deployVM_isolatedAndShared (test_shared_networks.TestSharedNetworks) > Test VM deployment in shared and isolated networks ... skipped 'skip' > test_deployVM_multipleSharedNetwork (test_shared_networks.TestSharedNetworks) > Test Vm deployment with multiple shared networks ... > ==> client.log <== > 2013-11-19 21:40:40,957 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - Admin account created: > 7d379404-9bf3-47aa-a4bc > -0fe77e7455eb > 2013-11-19 21:40:41,004 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - 2360 > 2013-11-19 21:40:41,004 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - Physical Network found: > 05ef4a90-f9ba-449f-b1b > 6-a437e6c4d4dd > 2013-11-19 21:40:41,071 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - Shared Network offering created: > d6b52bcc-f7d4 > -401a-83d2-6c049854ab76 > 2013-11-19 21:40:41,266 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - Shared Network created: > bc992430-00f8-42eb-9e2 > 2-fdfcf3b2e94a > 2013-11-19 21:40:41,321 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - 2368 > 2013-11-19 21:40:41,420 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - Network created: > e661393d-a1bb-4619-adcc-4d7d6 > 5172e29 > 2013-11-19 21:42:01,929 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - Virtual Machine created: > 44d30c61-07cb-4986-ab > 16-96b9506c6061 > 2013-11-19 21:43:47,519 - DEBUG - test_deployVM_multipleSharedNetwork > (test_shared_networks.TestSharedNetworks) - Virtual Machine created: > 2d0f4114-a763-43be-90 > 70-73e3bb74571f > > ==> result.log <== > ok > test_networkWithsubdomainaccessFalse (test_shared_networks.TestSharedNetworks) > Test shared Network with subdomainaccess=False ... skipped 'skip' > test_networkWithsubdomainaccessTrue (test_shared_networks.TestSharedNetworks) > Test Shared Network with subdomainaccess=True ... skipped 'skip' > test_sharedNetworkOffering_01 (test_shared_networks.TestSharedNetworks) > Test shared network Offering 01 ... skipped 'skip' > test_sharedNetworkOffering_02 (test_shared_networks.TestSharedNetworks) > Test Shared Network Offering 02 ... skipped 'skip' > test_sharedNetworkOffering_03 (test_shared_networks.TestSharedNetworks) > Test Shared Network Offering 03 ... skipped 'skip' > > ---------------------------------------------------------------------- > Ran 13 tests in 472.706s > > OK (skipped=12) > > > Test 2: > > ==> result.log <== > test_createSharedNetwork_All (test_shared_networks.TestSharedNetworks) > Test Shared Network ALL ... > ==> client.log <== > 2013-11-19 21:34:56,669 - DEBUG - test_createSharedNetwork_All > (test_shared_networks.TestSharedNetworks) - Admin type account created: > admin-XABU1-JAM9J0 > 2013-11-19 21:34:56,744 - DEBUG - test_createSharedNetwork_All > (test_shared_networks.TestSharedNetworks) - User type account created: > admin-XABU1-YIDA7H > 2013-11-19 21:34:56,782 - DEBUG - test_createSharedNetwork_All > (test_shared_networks.TestSharedNetworks) - Physical network found: > 05ef4a90-f9ba-449f-b1b6-a437e > 6c4d4dd > 2013-11-19 21:34:57,023 - DEBUG - test_createSharedNetwork_All > (test_shared_networks.TestSharedNetworks) - Shared Network offering created: > 575d5258-21eb-4f55-9 > 697-4fbdad00f0dd > 2013-11-19 21:34:57,221 - DEBUG - test_createSharedNetwork_All > (test_shared_networks.TestSharedNetworks) - Shared Network created for scope > domain: a9874639-d40 > c-4b8b-8129-6496bdf4aa07 > 2013-11-19 21:36:27,711 - DEBUG - test_createSharedNetwork_All > (test_shared_networks.TestSharedNetworks) - Virtual Machine created: > 7181bcb1-f114-4013-8d93-3696 > edcf7653 > 2013-11-19 21:36:32,971 - DEBUG - test_createSharedNetwork_All > (test_shared_networks.TestSharedNetworks) - Virtual Machine created: > 4562afe4-b2a5-473e-9c9f-4c2a > 31be6cef > > ==> result.log <== > ok > test_createSharedNetwork_accountSpecific > (test_shared_networks.TestSharedNetworks) > Test Shared Network with scope account ... skipped 'skip' > test_createSharedNetwork_domainSpecific > (test_shared_networks.TestSharedNetworks) > Test Shared Network with scope domain ... skipped 'skip' > test_createSharedNetwork_projectSpecific > (test_shared_networks.TestSharedNetworks) > Test Shared Network with scope project ... skipped 'skip' > test_createSharedNetwork_usedVlan (test_shared_networks.TestSharedNetworks) > Test Shared Network with used vlan 01 ... skipped 'skipped - This is a > redundant case and also this is causing issue for rest fo the cases ' > test_createSharedNetwork_usedVlan2 (test_shared_networks.TestSharedNetworks) > Test Shared Network with used vlan 02 ... skipped 'skip' > test_deployVM_isolatedAndShared (test_shared_networks.TestSharedNetworks) > Test VM deployment in shared and isolated networks ... skipped 'skip' > test_deployVM_multipleSharedNetwork (test_shared_networks.TestSharedNetworks) > Test Vm deployment with multiple shared networks ... skipped 'skip' > test_networkWithsubdomainaccessFalse (test_shared_networks.TestSharedNetworks) > Test shared Network with subdomainaccess=False ... skipped 'skip' > test_networkWithsubdomainaccessTrue (test_shared_networks.TestSharedNetworks) > Test Shared Network with subdomainaccess=True ... skipped 'skip' > test_sharedNetworkOffering_01 (test_shared_networks.TestSharedNetworks) > Test shared network Offering 01 ... skipped 'skip' > test_sharedNetworkOffering_02 (test_shared_networks.TestSharedNetworks) > Test Shared Network Offering 02 ... skipped 'skip' > test_sharedNetworkOffering_03 (test_shared_networks.TestSharedNetworks) > Test Shared Network Offering 03 ... skipped 'skip' > > ---------------------------------------------------------------------- > Ran 13 tests in 362.481s > > OK (skipped=12) > > > Thanks, > > Gaurav Aradhye > >
