diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-24 12:09:20 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-02-24 13:15:06 +0100 |
commit | 02bd6e30668b477781ab007e82bfe2a207baa8b7 (patch) | |
tree | f684f1c9fae6b09668ffa58b1f9a2861251fd710 /functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py | |
parent | 58dd7174657c66254ae4c511850ac7d49b1dd98f (diff) |
Update Functest to meet last snaps updates
It removes obsolete mockey patches in Rally unit tests and adds
keystone client as params when needed in orchestra_*ims.py [1].
[1] https://gerrit.opnfv.org/gerrit/#/c/52473/
Change-Id: Id02954d16f5f54cc0c390fadb498e14c6bab6ff9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py')
-rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py index 85c55ec5..7cfdf7b0 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -376,9 +376,10 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): break else: self.logger.info("Creating floating IP for Open Baton NFVO") + keystone_client = os_utils.get_keystone_client(self.creds) self.mano['details']['fip'] = snaps_utils.neutron_utils.\ create_floating_ip( - neutron_client, + neutron_client, keystone_client, self.mano['details']['external_net_name']) self.logger.info( "Created floating IP for Open Baton NFVO %s", @@ -643,9 +644,10 @@ class ClearwaterImsVnf(vnf.VnfOnBoarding): try: neutron_client = os_utils.get_neutron_client(self.creds) + keystone_client = os_utils.get_keystone_client(self.creds) self.logger.info("Deleting Open Baton Port...") port = snaps_utils.neutron_utils.get_port( - neutron_client, + neutron_client, keystone_client, port_name='%s_port' % self.case_name) snaps_utils.neutron_utils.delete_port(neutron_client, port) time.sleep(10) |