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/master to a4356b5
Date Sat, 25 May 2013 10:12:54 GMT
Updated Branches:
  refs/heads/master a21a4e5ac -> a4356b559


More fixes to regression tests:

- Remove extraneous non-ascii chars
- cloudconnection is auto GCed. No explicit cleanup required.
- Add environment tags for shared network tests
- Invalid account.account references
- Indentation errors
- Skip the storage motion test on unsuitable host environment
- remove copy template test. covered in the smoke tests
- invalid keys in service dictionary
- Unskipping tests skipped tests
-
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/a4356b55
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4356b55
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4356b55

Branch: refs/heads/master
Commit: a4356b559cb1401c790e1aa62606c1f256e75229
Parents: a21a4e5
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat May 25 15:03:56 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat May 25 15:40:42 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_custom_hostname.py |    2 +-
 .../component/test_high_availability.py            |    1 -
 .../component/test_host_high_availability.py       |    2 +-
 test/integration/component/test_project_limits.py  |    8 +-
 .../component/test_project_resources.py            |    4 +-
 test/integration/component/test_project_usage.py   |    2 +-
 test/integration/component/test_shared_networks.py |   13 ++
 test/integration/component/test_storage_motion.py  |    2 -
 test/integration/component/test_tags.py            |    2 +-
 test/integration/component/test_templates.py       |   89 ---------------
 .../integration/component/test_vm_passwdenabled.py |    4 +-
 .../component/test_vpc_network_lbrules.py          |   15 ---
 .../component/test_vpc_network_pfrules.py          |    8 --
 .../component/test_vpc_network_staticnatrule.py    |    4 -
 14 files changed, 25 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_custom_hostname.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_custom_hostname.py b/test/integration/component/test_custom_hostname.py
index e545214..a85f619 100644
--- a/test/integration/component/test_custom_hostname.py
+++ b/test/integration/component/test_custom_hostname.py
@@ -104,7 +104,7 @@ class TestInstanceNameFlagTrue(cloudstackTestCase):
         cls.services = Services().services
         # Get Zone, default template
         cls.zone = get_zone(cls.api_client, cls.services)
-   cls.services["mode"] = cls.zone.networktype
+        cls.services["mode"] = cls.zone.networktype
         cls.template = get_template(
                             cls.api_client,
                             cls.zone.id,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_high_availability.py b/test/integration/component/test_high_availability.py
index cd2dfce..7b0f78e 100644
--- a/test/integration/component/test_high_availability.py
+++ b/test/integration/component/test_high_availability.py
@@ -169,7 +169,6 @@ class TestHighAvailability(cloudstackTestCase):
         try:
             #Clean up, terminate the created accounts, domains etc
             cleanup_resources(self.apiclient, self.cleanup)
-            self.testClient.close()
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_host_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_host_high_availability.py b/test/integration/component/test_host_high_availability.py
index 8c66d17..7a1ad69 100644
--- a/test/integration/component/test_host_high_availability.py
+++ b/test/integration/component/test_host_high_availability.py
@@ -156,7 +156,7 @@ class TestHostHighAvailability(cloudstackTestCase):
         """ Test VM deployments (Create HA enabled Compute Service Offering and VM) """
         
         # Steps,
-        #1. Create a Compute service offering with the “Offer HA” option selected.
+        #1. Create a Compute service offering with the 'Offer HA' option selected.
         #2. Create a Guest VM with the compute service offering created above.
         # Validations,
         #1. Ensure that the offering is created and that in the UI the “Offer HA” field
is enabled (Yes)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 9184dca..af99717 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -201,8 +201,8 @@ class TestProjectLimits(cloudstackTestCase):
         project = Project.create(
                                  self.apiclient,
                                  self.services["project"],
-                                 account=self.admin.account.name,
-                                 domainid=self.admin.account.domainid
+                                 account=self.admin.name,
+                                 domainid=self.admin.domainid
                                  )
         # Cleanup created project at end of test
         self.cleanup.append(project)
@@ -343,8 +343,8 @@ class TestProjectLimits(cloudstackTestCase):
         project = Project.create(
                                  self.apiclient,
                                  self.services["project"],
-                                 account=self.admin.account.name,
-                                 domainid=self.admin.account.domainid
+                                 account=self.admin.name,
+                                 domainid=self.admin.domainid
                                  )
         # Cleanup created project at end of test
         self.cleanup.append(project)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index 8414188..378238e 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -651,9 +651,9 @@ class TestTemplates(cloudstackTestCase):
         """Test use of private template in a project
         """
         # 1. Create a project
-        # 2. Verify that in order to use somebody’s Private template for vm
+        # 2. Verify that in order to use somebody's Private template for vm
         #    creation in the project, permission to use the template has to
-        #    be granted to the Project (use API “updateTemplatePermissions”
+        #    be granted to the Project (use API 'updateTemplatePermissions'
         #    with project id to achieve that).
 
         self.debug("Deploying VM for with public template: %s" %

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index ab789e1..bb253e1 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -124,7 +124,7 @@ class TestVmUsage(cloudstackTestCase):
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client, cls.services)
         cls.zone = get_zone(cls.api_client, cls.services)
-        cls.services['mode'] = cls.cls.zone.networktype
+        cls.services['mode'] = cls.zone.networktype
 
         template = get_template(
                             cls.api_client,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_shared_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_shared_networks.py b/test/integration/component/test_shared_networks.py
index 9845826..5f96419 100644
--- a/test/integration/component/test_shared_networks.py
+++ b/test/integration/component/test_shared_networks.py
@@ -235,6 +235,7 @@ class TestSharedNetworks(cloudstackTestCase):
             raise Exception("Warning: Exception during network cleanup : %s" % e)
         return
 
+    @attr(tags=["advanced", "advancedns"])
     def test_sharedNetworkOffering_01(self):
         """  Test shared network Offering 01 """
         
@@ -372,6 +373,7 @@ class TestSharedNetworks(cloudstackTestCase):
             )
         self.debug("NetworkOffering created and enabled: %s" % self.shared_network_offering.id)
 
+    @attr(tags=["advanced", "advancedns"])
     def test_sharedNetworkOffering_02(self):
         """ Test Shared Network Offering 02 """
         
@@ -459,6 +461,7 @@ class TestSharedNetworks(cloudstackTestCase):
         except Exception as e:
             self.debug("Network Offering creation failed with vlan as False in advance mode
and shared guest type.")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_sharedNetworkOffering_03(self):
         """ Test Shared Network Offering 03 """
         
@@ -547,6 +550,7 @@ class TestSharedNetworks(cloudstackTestCase):
         except Exception as e:
             self.debug("Network Offering creation failed with vlan as true and ip ranges
as False in advance mode and with shared guest type.")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_createSharedNetwork_All(self):
         """ Test Shared Network ALL  """
         
@@ -829,6 +833,7 @@ class TestSharedNetworks(cloudstackTestCase):
         if netaddr.IPAddress(unicode(vms[0].nic[0].ipaddress)) not in ip_range:
             self.fail("Virtual machine ip should be from the ip range assigned to network
created.")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_createSharedNetwork_accountSpecific(self):
         """ Test Shared Networm with scope account """
         
@@ -1092,6 +1097,7 @@ class TestSharedNetworks(cloudstackTestCase):
         if netaddr.IPAddress(unicode(vms[0].nic[0].ipaddress)) not in ip_range:
             self.fail("Virtual machine ip should be from the ip range assigned to network
created.")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_createSharedNetwork_domainSpecific(self):
         """ Test Shared Network with scope domain """
         
@@ -1446,6 +1452,7 @@ class TestSharedNetworks(cloudstackTestCase):
         if netaddr.IPAddress(unicode(vms[0].nic[0].ipaddress)) not in ip_range:
             self.fail("Virtual machine ip should be from the ip range assigned to network
created.")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_createSharedNetwork_projectSpecific(self):
         """ Test Shared Network with scope project  """
         
@@ -1740,6 +1747,7 @@ class TestSharedNetworks(cloudstackTestCase):
         if netaddr.IPAddress(unicode(vms[0].nic[0].ipaddress)) not in ip_range:
             self.fail("Virtual machine ip should be from the ip range assigned to network
created.")
 		
+    @attr(tags=["advanced", "advancedns"])
     def test_createSharedNetwork_usedVlan(self):
         """ Test Shared Network with used vlan 01 """
         
@@ -1898,6 +1906,7 @@ class TestSharedNetworks(cloudstackTestCase):
         except Exception as e:
             self.debug("Network creation failed because the valn id being used by another
network.")
     
+    @attr(tags=["advanced", "advancedns"])
     def test_createSharedNetwork_usedVlan2(self):
         """ Test Shared Network with used vlan 02 """
         
@@ -2093,6 +2102,7 @@ class TestSharedNetworks(cloudstackTestCase):
         except Exception as e:
             self.debug("Network creation failed because the valn id being used by another
network.")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_deployVM_multipleSharedNetwork(self):
         """ Test Vm deployment with multiple shared networks """
         
@@ -2350,6 +2360,7 @@ class TestSharedNetworks(cloudstackTestCase):
         
         self.assertTrue(self.network1_admin_account_virtual_machine.nic[0].ipaddress is not
None, "ip should be assigned to running virtual machine")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_deployVM_isolatedAndShared(self):
         """ Test VM deployment in shared and isolated networks """
         
@@ -2697,6 +2708,7 @@ class TestSharedNetworks(cloudstackTestCase):
         except Exception as e:
             self.fail("SSH Access failed for %s: %s" % (self.isolated_network_admin_account_virtual_machine.ipaddress,
e))
 
+    @attr(tags=["advanced", "advancedns"])
     def test_networkWithsubdomainaccessTrue(self):
         """ Test Shared Network with subdomainaccess=True """
         
@@ -2841,6 +2853,7 @@ class TestSharedNetworks(cloudstackTestCase):
         except:
             self.debug("Network creation failed because subdomainaccess parameter was passed
when scope was account.")
 
+    @attr(tags=["advanced", "advancedns"])
     def test_networkWithsubdomainaccessFalse(self):
         """ Test shared Network with subdomainaccess=False """
         

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_storage_motion.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_storage_motion.py b/test/integration/component/test_storage_motion.py
index cf110d3..0dcc7f8 100644
--- a/test/integration/component/test_storage_motion.py
+++ b/test/integration/component/test_storage_motion.py
@@ -178,8 +178,6 @@ class TestStorageMotion(cloudstackTestCase):
         # Migrate to a host that requires storage motion
         hosts[:] = [host for host in hosts if host.requiresStorageMotion]
 
-        self.assert_(hosts is not None, msg="No valid hosts for storage motion")
-        self.assert_(len(hosts)>0, msg="No valid hosts for storage motion. Skipping")
         if hosts is None or len(hosts) == 0:
             self.skipTest("No valid hosts for storage motion. Skipping")
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_tags.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py
index 12a5863..514c2f7 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -216,7 +216,7 @@ class TestResourceTags(cloudstackTestCase):
                                     cls.api_client,
                                     cls.services["virtual_machine"],
                                     accountid=cls.account.name,
-                                    domainid=cls.account.account.domainid,
+                                    domainid=cls.account.domainid,
                                     serviceofferingid=cls.service_offering.id,
                                     mode=cls.zone.networktype
                                 )

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index 1a60123..65beabf 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -93,7 +93,6 @@ class Services:
                                 "templatefilter": 'self',
                         },
                         "templatefilter": 'self',
-                        "destzoneid": 2,    # For Copy template (Destination zone)
                         "ostype": 'CentOS 5.3 (64-bit)',
                         "sleep": 60,
                         "timeout": 10,
@@ -423,94 +422,6 @@ class TestTemplates(cloudstackTestCase):
                         )
         return
 
-    @attr(tags = ["advanced", "advancedns", "multizone"])
-    def test_02_copy_template(self):
-        """Test for copy template from one zone to another"""
-
-        # Validate the following
-        # 1. copy template should be successful and
-        #    secondary storage should contain new copied template.
-
-        self.debug(
-            "Copying template from zone: %s to %s" % (
-                                                self.template.id,
-                                                self.services["destzoneid"]
-                                                ))
-        cmd = copyTemplate.copyTemplateCmd()
-        cmd.id = self.template.id
-        cmd.destzoneid = self.services["destzoneid"]
-        cmd.sourcezoneid = self.zone.id
-        self.apiclient.copyTemplate(cmd)
-
-        # Verify template is copied to another zone using ListTemplates
-        list_template_response = list_templates(
-                                    self.apiclient,
-                                    templatefilter=\
-                                    self.services["templatefilter"],
-                                    id=self.template.id,
-                                    zoneid=self.services["destzoneid"]
-                                    )
-        self.assertEqual(
-                        isinstance(list_template_response, list),
-                        True,
-                        "Check for list template response return valid list"
-                        )
-
-        self.assertNotEqual(
-                            len(list_template_response),
-                            0,
-                            "Check template extracted in List Templates"
-                        )
-
-        template_response = list_template_response[0]
-        self.assertEqual(
-                            template_response.id,
-                            self.template.id,
-                            "Check ID of the downloaded template"
-                        )
-        self.assertEqual(
-                            template_response.zoneid,
-                            self.services["destzoneid"],
-                            "Check zone ID of the copied template"
-                        )
-
-        # Cleanup- Delete the copied template
-        timeout = self.services["timeout"]
-        while True:
-            time.sleep(self.services["sleep"])
-            list_template_response = list_templates(
-                                        self.apiclient,
-                                        templatefilter=\
-                                        self.services["templatefilter"],
-                                        id=self.template_2.id,
-                                        zoneid=self.services["destzoneid"]
-                                        )
-            self.assertEqual(
-                                isinstance(list_template_response, list),
-                                True,
-                                "Check list response returns a valid list"
-                            )
-            self.assertNotEqual(
-                                len(list_template_response),
-                                0,
-                                "Check template extracted in List Templates"
-                            )
-    
-            template_response = list_template_response[0]
-            if template_response.isready == True:
-                break
-
-            if timeout == 0:
-                raise Exception(
-                        "Failed to download copied template(ID: %s)" % template_response.id)
-
-            timeout = timeout - 1
-        cmd = deleteTemplate.deleteTemplateCmd()
-        cmd.id = self.template.id
-        cmd.zoneid = self.services["destzoneid"]
-        self.apiclient.deleteTemplate(cmd)
-        return
-
     @attr(tags = ["advanced", "advancedns"])
     def test_03_delete_template(self):
         """Test Delete template

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_vm_passwdenabled.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py
index e89253c..e22a1a0 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -90,8 +90,8 @@ class TestVMPasswordEnabled(cloudstackTestCase):
             cls.services["ostype"]
         )
         # Set Zones and disk offerings
-        cls.services["small"]["zoneid"] = zone.id
-        cls.services["small"]["template"] = template.id
+        cls.services["service_offerings"]["small"]["zoneid"] = zone.id
+        cls.services["service_offerings"]["small"]["template"] = template.id
 
         # Create VMs, NAT Rules etc
         cls.account = Account.create(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_vpc_network_lbrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_lbrules.py b/test/integration/component/test_vpc_network_lbrules.py
index b4a6607..66d6c4d 100644
--- a/test/integration/component/test_vpc_network_lbrules.py
+++ b/test/integration/component/test_vpc_network_lbrules.py
@@ -505,7 +505,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return nwacl_internet_1
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_01_VPC_LBRulesListing(self):
         """ Test case no 210 and 227: List Load Balancing Rules belonging to a VPC
         """
@@ -551,7 +550,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_02_VPC_LBRulesAndVMListing(self):
         """ Test case no 211 and 228: List only VMs suitable for the Virtual Network on VPC
for LB Rule
         """
@@ -595,7 +593,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_03_VPC_CreateLBRuleInMultipleNetworks(self):
         """ Test case no 212 : Create LB rules for 1 network which is part of a two/multiple
virtual networks of a
             VPC using a new Public IP Address available with the VPC when the Virtual Router
is in Running State
@@ -623,7 +620,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_04_VPC_CreateLBRuleInMultipleNetworksVRStoppedState(self):
         """ Test case no 222 : Create LB rules for a two/multiple virtual networks of a 
             VPC using a new Public IP Address available with the VPC when the Virtual Router
is in Stopped State
@@ -651,7 +647,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return    
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_05_VPC_CreateAndDeleteLBRule(self):
         """ Test case no 214 : Delete few(not all) LB rules for a single virtual network
of a
             VPC belonging to a single Public IP Address when the Virtual Router is in Running
State
@@ -683,7 +678,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_06_VPC_CreateAndDeleteLBRuleVRStopppedState(self):
         """ Test case no 224 : Delete few(not all) LB rules for a single virtual network
of 
             a VPC belonging to a single Public IP Address when the Virtual Router is in Stopped
State
@@ -715,7 +709,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return    
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_07_VPC_CreateAndDeleteAllLBRule(self):
         """ Test case no 215 : Delete all LB rules for a single virtual network of a
             VPC belonging to a single Public IP Address when the Virtual Router is in Running
State
@@ -749,7 +742,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_08_VPC_CreateAndDeleteAllLBRuleVRStoppedState(self):
         """ Test case no 225 and 226 : Delete all LB rules for a single virtual network of
a 
             VPC belonging to a single Public IP Address when the Virtual Router is in Stopped
State
@@ -783,7 +775,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
     
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_09_VPC_LBRuleCreateFailMultipleVPC(self):
         """ Test case no 234 : User should not be allowed to create a LB rule for a VM that
belongs to a different VPC.
         """
@@ -822,7 +813,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_10_VPC_FailedToCreateLBRuleNonVPCNetwork(self):
         """ Test case no 216 and 235: User should not be allowed to create a LB rule for
a VM that does not belong to any VPC.
         """
@@ -860,7 +850,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_11_VPC_LBRuleCreateNotAllowed(self):
         """ Test case no 217 and 236: User should not be allowed to create a LB rule for
a
             VM that does not belong to the same network but belongs to the same VPC.
@@ -899,7 +888,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_12_VPC_LBRuleCreateFailForRouterIP(self):
         """ Test case no 218 and 237: User should not be allowed to create a LB rule on an
Ipaddress that Source Nat enabled.
         """
@@ -928,7 +916,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_13_VPC_LBRuleCreateFailForPFSourceNATIP(self):
         """ Test case no 219 : User should not be allowed to create a LB rule on an Ipaddress
that already has a PF rule.
         """
@@ -959,7 +946,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_14_VPC_LBRuleCreateFailForStaticNatRule(self):
         """ Test case no 220 : User should not be allowed to create a LB rule on an Ipaddress
that already has a Static Nat rule.
         """
@@ -990,7 +976,6 @@ class TestVPCNetworkLBRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_15_VPC_RleaseIPForLBRuleCreated(self):
         """ Test case no 221 : Release Ip address that has a LB rule assigned to it.
         """

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_vpc_network_pfrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py
index 56792f4..c0c2b86 100644
--- a/test/integration/component/test_vpc_network_pfrules.py
+++ b/test/integration/component/test_vpc_network_pfrules.py
@@ -553,7 +553,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_03_network_services_VPC_StopCreateMultiplePF(self):
         """ Test case no 205 : Create PF rules for a two/multiple virtual networks of a VPC
using
                 a new Public IP Address available with the VPC when Virtual Router is in
Stopped State
@@ -587,7 +586,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_04_network_services_VPC_CreateMultiplePF(self):
         """ Test case no 191 : Create PF rules for a two/multiple virtual networks of a VPC
using a
                 new Public IP Address available with the VPC when Virtual Router is in Running
State
@@ -620,7 +618,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_05_network_services_VPC_StopDeletePF(self):
         """ Test case no 207 : Delete few(not all) PF rules for a single virtual network
of
             a VPC belonging to a single Public IP Address when Virtual Router is in Stopped
State
@@ -654,7 +651,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_06_network_services_VPC_DeletePF(self):
         """ Test case no 193 : Delete few(not all) PF rules for a single virtual network
of
                 a VPC belonging to a single Public IP Address when Virtual Router is in Running
State
@@ -684,7 +680,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_07_network_services_VPC_StopDeleteAllPF(self):
         """ Test case no 208 : Delete all PF rules for a single virtual network of a
                 VPC belonging to a single Public IP Address when Virtual Router is in Stopped
State
@@ -721,7 +716,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_08_network_services_VPC_DeleteAllPF(self):
         """ Test case no 194 : Delete all PF rules for a single virtual network of a
                 VPC belonging to a single Public IP Address when Virtual Router is in Running
State
@@ -754,7 +748,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_09_network_services_VPC_StopDeleteAllMultiplePF(self):
         """ Test case no 209 : Delete all PF rules for two/multiple virtual networks of a
VPC.
                 Observe the status of the Public IP Addresses of the rules when Virtual Router
is in Stopped State
@@ -817,7 +810,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_10_network_services_VPC_DeleteAllMultiplePF(self):
         """ Test case no 195: Delete all PF rules for two/multiple virtual networks of a
VPC.
                 Observe the status of the Public IP Addresses of the rules when Virtual Router
is in Running State

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4356b55/test/integration/component/test_vpc_network_staticnatrule.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py
index aceca62..bed1b52 100644
--- a/test/integration/component/test_vpc_network_staticnatrule.py
+++ b/test/integration/component/test_vpc_network_staticnatrule.py
@@ -552,7 +552,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_03_VPC_StopCreateMultipleStaticNatRuleStopppedState(self):
         """ Test case no extra : Create Static Nat Rule rules for a two/multiple virtual
networks of a VPC using
                 a new Public IP Address available with the VPC when Virtual Router is in
Stopped State
@@ -586,7 +585,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_04_VPC_CreateMultipleStaticNatRule(self):
         """ Test case no 230 : Create Static NAT Rules for a two/multiple virtual networks
of 
             a VPC using a new Public IP Address available with the VPC when the Virtual Router
is in Running State
@@ -619,7 +617,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_05_network_services_VPC_DeleteAllPF(self):
         """ Test case no 232: Delete all Static NAT Rules for a single virtual network of

             a VPC belonging to a single Public IP Address when the Virtual Router is in Running
State
@@ -651,7 +648,6 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "intervlan"])
-    @unittest.skip("Implemented but not executed: VPC with multiple network fails to set
PF rule.")
     def test_06_network_services_VPC_DeleteAllMultiplePF(self):
         """ Test case no 233: Delete all Static NAT rules for two/multiple virtual networks
of a VPC. 
             Observe the status of the Public IP Addresses of the rules when the Virtual Router
is in Running State.


Mime
View raw message