mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	remove vpc offering from cleanup.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> (cherry picked from commit 83f4c3289aa380e792353c87128f07ae1463e7db)
This commit is contained in:
		
							parent
							
								
									9fe5d398a2
								
							
						
					
					
						commit
						dd1717883e
					
				| @ -278,7 +278,6 @@ class TestVPCOffering(cloudstackTestCase): | |||||||
|                                      self.services["vpc_offering"] |                                      self.services["vpc_offering"] | ||||||
|                                      ) |                                      ) | ||||||
| 
 | 
 | ||||||
|         self.cleanup.append(vpc_off) |  | ||||||
|         self.validate_vpc_offering(vpc_off) |         self.validate_vpc_offering(vpc_off) | ||||||
| 
 | 
 | ||||||
|         self.debug("Enabling the VPC offering created") |         self.debug("Enabling the VPC offering created") | ||||||
| @ -456,62 +455,6 @@ class TestVPCOffering(cloudstackTestCase): | |||||||
|                          "List public Ip for network should list the Ip addr" |                          "List public Ip for network should list the Ip addr" | ||||||
|                          ) |                          ) | ||||||
|         # TODO: Remote Access VPN is not yet supported in VPC |         # TODO: Remote Access VPN is not yet supported in VPC | ||||||
| #        self.debug("Associating public IP for network: %s" % network.name) |  | ||||||
| #        public_ip_4 = PublicIPAddress.create( |  | ||||||
| #                                self.apiclient, |  | ||||||
| #                                accountid=self.account.name, |  | ||||||
| #                                zoneid=self.zone.id, |  | ||||||
| #                                domainid=self.account.domainid, |  | ||||||
| #                                networkid=network.id, |  | ||||||
| #                                vpcid=vpc.id |  | ||||||
| #                                ) |  | ||||||
| #        self.debug("Associated %s with network %s" % ( |  | ||||||
| #                                        public_ip_4.ipaddress.ipaddress, |  | ||||||
| #                                        network.id |  | ||||||
| #                                        )) |  | ||||||
| # |  | ||||||
| #        self.debug("Creating a remote access VPN for account: %s" % |  | ||||||
| #                                                self.account.name) |  | ||||||
| # |  | ||||||
| #        try: |  | ||||||
| #            vpn = Vpn.create( |  | ||||||
| #                         self.apiclient, |  | ||||||
| #                         publicipid=public_ip_4.ipaddress.id, |  | ||||||
| #                         account=self.account.name, |  | ||||||
| #                         domainid=self.account.domainid, |  | ||||||
| #                         networkid=network.id, |  | ||||||
| #                         vpcid=vpc.id |  | ||||||
| #                         ) |  | ||||||
| #        except Exception as e: |  | ||||||
| #            self.fail("Failed to create VPN for account: %s - %s" % ( |  | ||||||
| #                                                 self.account.name, e)) |  | ||||||
| # |  | ||||||
| #        try: |  | ||||||
| #            vpnuser = VpnUser.create( |  | ||||||
| #                                 self.apiclient, |  | ||||||
| #                                 username="root", |  | ||||||
| #                                 password="password", |  | ||||||
| #                                 account=self.account.name, |  | ||||||
| #                                 domainid=self.account.domainid |  | ||||||
| #                                 ) |  | ||||||
| #        except Exception as e: |  | ||||||
| #            self.fail("Failed to create VPN user: %s" % e) |  | ||||||
| # |  | ||||||
| #        self.debug("Checking if the remote access VPN is created or not?") |  | ||||||
| #        remote_vpns = Vpn.list( |  | ||||||
| #                               self.apiclient, |  | ||||||
| #                               account=self.account.name, |  | ||||||
| #                               domainid=self.account.domainid, |  | ||||||
| #                               publicipid=public_ip_4.ipaddress.id, |  | ||||||
| #                               listall=True |  | ||||||
| #                               ) |  | ||||||
| #        self.assertEqual( |  | ||||||
| #                         isinstance(remote_vpns, list), |  | ||||||
| #                         True, |  | ||||||
| #                         "List remote VPNs should not return empty response" |  | ||||||
| #                         ) |  | ||||||
| #        self.debug("Deleting the remote access VPN for account: %s" % |  | ||||||
| #                                                self.account.name) |  | ||||||
|         return |         return | ||||||
| 
 | 
 | ||||||
|     @attr(tags=["advanced", "intervlan"]) |     @attr(tags=["advanced", "intervlan"]) | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user