diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-30 02:13:30 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-30 02:34:54 +0200 |
| commit | e813e044715dca61a9ec7139d591fb1716830367 (patch) | |
| tree | dabd2eaceb8768e3d962972f2b53bed9beb55b76 /functest/opnfv_tests/vnf/router | |
| parent | dce06c617501dacdd5b7ea2e444e53ce93b74636 (diff) | |
Fix clean() in cloudify ims and router
It raised exceptions in both branches [1]
[1] https://build.opnfv.org/ci/view/functest/job/functest-compass-baremetal-daily-master/209/console
Change-Id: I87b33cedae768f92296efa4570d2a47cd9cdbdf2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 6ff2161dd0af56bcbac49fd1417dc52031c55bf5)
Diffstat (limited to 'functest/opnfv_tests/vnf/router')
| -rw-r--r-- | functest/opnfv_tests/vnf/router/cloudify_vrouter.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py index de2105fce..02d871fd9 100644 --- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py +++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py @@ -230,7 +230,7 @@ class CloudifyVrouter(cloudify.Cloudify): dep_name = self.vnf['descriptor'].get('name') # kill existing execution self.__logger.info('Deleting the current deployment') - exec_list = self.cfy_client.executions.list(dep_name) + exec_list = self.cfy_client.executions.list() for execution in exec_list: if execution['status'] == "started": try: @@ -251,6 +251,10 @@ class CloudifyVrouter(cloudify.Cloudify): 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) def wait_for_execution(client, execution, logger, timeout=7200, ): |