cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/4.2 to 83f4c32
Date Mon, 29 Jul 2013 11:08:41 GMT
Updated Branches:
  refs/heads/4.2 6154c5224 -> 83f4c3289


remove vpc offering from cleanup.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83f4c328
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83f4c328
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/83f4c328

Branch: refs/heads/4.2
Commit: 83f4c3289aa380e792353c87128f07ae1463e7db
Parents: 6154c52
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Jul 29 16:37:33 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Jul 29 16:37:54 2013 +0530

----------------------------------------------------------------------
 .../integration/component/test_vpc_offerings.py | 57 --------------------
 1 file changed, 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83f4c328/test/integration/component/test_vpc_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py
index 5911270..109c8d1 100644
--- a/test/integration/component/test_vpc_offerings.py
+++ b/test/integration/component/test_vpc_offerings.py
@@ -278,7 +278,6 @@ class TestVPCOffering(cloudstackTestCase):
                                      self.services["vpc_offering"]
                                      )
 
-        self.cleanup.append(vpc_off)
         self.validate_vpc_offering(vpc_off)
 
         self.debug("Enabling the VPC offering created")
@@ -456,62 +455,6 @@ class TestVPCOffering(cloudstackTestCase):
                          "List public Ip for network should list the Ip addr"
                          )
         # 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
 
     @attr(tags=["advanced", "intervlan"])


Mime
View raw message