----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/16541/#review31021 -----------------------------------------------------------
Ship it! Committed to 4.3 and master. - Girish Shilamkar On Dec. 31, 2013, 1:21 p.m., Gaurav Aradhye wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/16541/ > ----------------------------------------------------------- > > (Updated Dec. 31, 2013, 1:21 p.m.) > > > Review request for cloudstack and Girish Shilamkar. > > > Bugs: CLOUDSTACK-5636 > https://issues.apache.org/jira/browse/CLOUDSTACK-5636 > > > Repository: cloudstack-git > > > Description > ------- > > Changes: > 1) Load balancing rule is now applied to only one VM and not the other VM for > which static NAT rule has been created. There is no need to include that VM > under load balancing for which static NAT is defined. > > 2) When all the VMs in the VPC are stopped, network state goes from > Implemented --> Shutdown --> Allocated. We can't update the network when it > is in Shutdown state, we should wait for the network state to become > Allocated. Added check for network state and then updated the network. This > resolves the root cause of the issue 5636 (Failed to shutdown the network > elements and resources as a part of update to network with specified id; > network is in wrong state: Shutdown'). > > 3) Code cleanup - removed unused variables, modifyed imports, removed > white-spaces. > > > Diffs > ----- > > test/integration/component/test_vpc_network.py 9b2269d > > Diff: https://reviews.apache.org/r/16541/diff/ > > > Testing > ------- > > Tested locally. > > Log: > > test_01_create_network_network_offering > (test_vpc_network_fixed.TestVPCNetwork) > Test create network in VPC ... skipped 'skip' > test_01_create_network_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetwork) > Test create network in VPC ... skipped 'skip' > test_02_create_network_fail_network_offering > (test_vpc_network_fixed.TestVPCNetwork) > Test create network in VPC mismatched services (Should fail) ... skipped > 'skip' > test_02_create_network_fail_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetwork) > Test create network in VPC mismatched services (Should fail) ... skipped > 'skip' > test_04_create_multiple_networks_with_lb_network_offering > (test_vpc_network_fixed.TestVPCNetwork) > Test create multiple networks with LB service (Should fail) ... skipped 'skip' > test_04_create_multiple_networks_with_lb_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetwork) > Test create multiple networks with LB service (Should fail) ... skipped 'skip' > test_05_create_network_ext_LB (test_vpc_network_fixed.TestVPCNetwork) > Test create network with external LB devices ... skipped 'skip' > test_06_create_network_with_rvr (test_vpc_network_fixed.TestVPCNetwork) > Test create network with redundant router capability ... skipped 'skip' > test_07_create_network_unsupported_services > (test_vpc_network_fixed.TestVPCNetwork) > Test create network services not supported by VPC (Should fail) ... skipped > 'skip' > test_08_create_network_without_sourceNAT > (test_vpc_network_fixed.TestVPCNetwork) > Test create network without sourceNAT service in VPC (should fail) ... > skipped 'skip' > test_09_create_network_shared_nwoff_network_off_shared > (test_vpc_network_fixed.TestVPCNetwork) > Test create network with shared network offering ... skipped 'skip' > test_09_create_network_shared_nwoff_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetwork) > Test create network with shared network offering ... skipped 'skip' > test_10_create_network_with_conserve_mode_network_offering > (test_vpc_network_fixed.TestVPCNetwork) > Test create network with conserve mode ON ... skipped 'skip' > test_10_create_network_with_conserve_mode_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetwork) > Test create network with conserve mode ON ... skipped 'skip' > test_01_wait_network_gc (test_vpc_network_fixed.TestVPCNetworkGc) > Test network gc after shutdown of vms in the network ... skipped 'skip' > test_02_start_vm_network_gc (test_vpc_network_fixed.TestVPCNetworkGc) > Test network rules after starting a VpcVr that was shutdown after network.gc > ... skipped 'skip' > test_03_restart_vpcvr (test_vpc_network_fixed.TestVPCNetworkGc) > Test Stop all the Vms that are part of the a Network ... skipped 'skip' > test_01_create_network_outside_range_network_offering > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network outside cidr range of VPC ... skipped 'skip' > test_01_create_network_outside_range_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network outside cidr range of VPC ... skipped 'skip' > test_02_create_network_outside_range > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network outside cidr range of VPC ... skipped 'skip' > test_03_create_network_inside_range_network_offering > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network inside cidr range of VPC ... skipped 'skip' > test_03_create_network_inside_range_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network inside cidr range of VPC ... skipped 'skip' > test_04_create_network_overlapping_range_network_offering > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network overlapping cidr range of VPC ... skipped 'skip' > test_04_create_network_overlapping_range_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network overlapping cidr range of VPC ... skipped 'skip' > test_05_create_network_diff_account_network_offering > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network from different account in VPC ... skipped 'skip' > test_05_create_network_diff_account_network_offering_vpcns > (test_vpc_network_fixed.TestVPCNetworkRanges) > Test create network from different account in VPC ... skipped 'skip' > test_01_network_services_upgrade > (test_vpc_network_fixed.TestVPCNetworkUpgrade) > Test update Network that is part of a VPC to a network offering that has more > services ... ok > test_02_network_vpcvr2vr_upgrade > (test_vpc_network_fixed.TestVPCNetworkUpgrade) > Test update Network that is NOT part of a VPC to a nw offering that has > services that are provided by VPCVR and vice versa ... skipped 'skip' > > ---------------------------------------------------------------------- > Ran 28 tests in 562.911s > > OK (skipped=27) > > > Thanks, > > Gaurav Aradhye > >
