@@ -1862,6 +1862,7 @@ def setUpClass(cls):
18621862 # Create Network Offering
18631863 cls .services ["shared_network_offering" ]["specifyVlan" ] = "True"
18641864 cls .services ["shared_network_offering" ]["specifyIpRanges" ] = "True"
1865+ cls .hv = cls .testClient .getHypervisorInfo ()
18651866 cls .shared_network_offering = NetworkOffering .create (cls .apiclient , cls .services ["shared_network_offering" ],
18661867 conservemode = False )
18671868
@@ -1884,6 +1885,7 @@ def setUpClass(cls):
18841885 zoneid = cls .zone .id )
18851886 cls ._cleanup = [
18861887 cls .service_offering ,
1888+ cls .shared_network ,
18871889 cls .shared_network_offering
18881890 ]
18891891 return
@@ -1960,6 +1962,8 @@ def verify_ip_address_in_router(self, router, host, ipaddress, device, isExist=T
19601962
19611963 @attr (tags = ["advanced" , "shared" ])
19621964 def test_01_deployVMInSharedNetwork (self ):
1965+ if self .hv .lower () == 'simulator' :
1966+ self .skipTest ("Hypervisor is simulator - skipping Test.." )
19631967 try :
19641968 self .virtual_machine = VirtualMachine .create (self .apiclient , self .services ["virtual_machine" ],
19651969 networkids = [self .shared_network .id ],
@@ -1993,6 +1997,8 @@ def test_01_deployVMInSharedNetwork(self):
19931997
19941998 @attr (tags = ["advanced" , "shared" ])
19951999 def test_02_verifyRouterIpAfterNetworkRestart (self ):
2000+ if self .hv .lower () == 'simulator' :
2001+ self .skipTest ("Hypervisor is simulator - skipping Test.." )
19962002 routerIp = self .services ["shared_network" ]["routerip" ]
19972003 self .debug ("restarting network with cleanup" )
19982004 try :
@@ -2018,12 +2024,14 @@ def test_02_verifyRouterIpAfterNetworkRestart(self):
20182024
20192025 @attr (tags = ["advanced" , "shared" ])
20202026 def test_03_destroySharedNetwork (self ):
2027+ if self .hv .lower () == 'simulator' :
2028+ self .skipTest ("Hypervisor is simulator - skipping Test.." )
20212029 routerIp = self .services ["shared_network" ]["routerip" ]
20222030 try :
20232031 self .shared_network .delete (self .apiclient )
20242032 except Exception as e :
20252033 self .fail ("Failed to destroy the shared network" )
2026-
2034+ self . _cleanup . remove ( self . shared_network )
20272035 self .debug ("Fetch the placeholder record for the router" )
20282036 nic_ip_address = self .dbclient .execute (
20292037 "select ip4_address from nics where strategy='Placeholder' and ip4_address = '%s' and removed is NOT NULL;" % routerIp );
0 commit comments