X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fvnf%2Frouter%2Fcloudify_vrouter.py;h=e8c8632bdd7bc66feb8cfde602f4f2727292d232;hb=65b9318ffcb4b12e0aa4aa08027a35ff1e2d285d;hp=79e8d801ab6ea2b0079866056c347b5f85b481ed;hpb=6ff2161dd0af56bcbac49fd1417dc52031c55bf5;p=functest.git

diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 79e8d801a..e8c8632bd 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -159,7 +159,7 @@ class CloudifyVrouter(cloudify.Cloudify):
         self.vnf['inputs'].update(dict(
             keystone_url=self.get_public_auth_url(self.orig_cloud)))
 
-        if (self.deploy_vnf() and self.test_vnf()):
+        if self.deploy_vnf() and self.test_vnf():
             self.result = 100
             return 0
         self.result = 1/3 * 100
@@ -167,11 +167,6 @@ class CloudifyVrouter(cloudify.Cloudify):
 
     def deploy_vnf(self):
         start_time = time.time()
-
-        self.cloud.create_security_group_rule(
-            'default', port_range_min=22, port_range_max=22,
-            protocol='tcp', direction='ingress')
-
         self.__logger.info("Upload VNFD")
         descriptor = self.vnf['descriptor']
         self.util_info["cfy"] = self.cfy_client
@@ -249,12 +244,11 @@ class CloudifyVrouter(cloudify.Cloudify):
                 self.vnf['descriptor'].get('name'))
         except Exception:  # pylint: disable=broad-except
             self.__logger.exception("Some issue during the undeployment ..")
-
-        super(CloudifyVrouter, self).clean()
         if self.image_alt:
             self.cloud.delete_image(self.image_alt)
         if self.flavor_alt:
             self.orig_cloud.delete_flavor(self.flavor_alt.id)
+        super(CloudifyVrouter, self).clean()
 
 
 def wait_for_execution(client, execution, logger, timeout=7200, ):