X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=snaps%2Fprovisioning%2Ftests%2Fansible_utils_tests.py;h=b6ace310398e4ba2f0af47ee46b6d4200580b138;hb=refs%2Fchanges%2F15%2F64515%2F1;hp=851dd644d5328d26d9a9d52f78d14c8ba23fad22;hpb=7ea11eada552627b5385a6a347f23fccee484e67;p=snaps.git

diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py
index 851dd64..b6ace31 100644
--- a/snaps/provisioning/tests/ansible_utils_tests.py
+++ b/snaps/provisioning/tests/ansible_utils_tests.py
@@ -19,7 +19,6 @@ import os
 import pkg_resources
 from scp import SCPClient
 
-from snaps.config.flavor import FlavorConfig
 from snaps.config.keypair import KeypairConfig
 from snaps.config.network import PortConfig
 from snaps.config.security_group import (
@@ -58,7 +57,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase):
         """
         super(self.__class__, self).__start__()
 
-        self.nova = nova_utils.nova_client(self.os_creds)
+        self.nova = nova_utils.nova_client(self.os_creds, self.os_session)
 
         guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
         self.keypair_priv_filepath = 'tmp/' + guid
@@ -84,13 +83,15 @@ class AnsibleProvisioningTests(OSIntegrationTestCase):
             os_image_settings = openstack_tests.ubuntu_image_settings(
                 name=guid + '-' + '-image',
                 image_metadata=self.image_metadata)
-            self.image_creator = create_image.OpenStackImage(self.os_creds,
-                                                             os_image_settings)
+            self.image_creator = create_image.OpenStackImage(
+                self.os_creds, os_image_settings)
             self.image_creator.create()
 
             # First network is public
             self.pub_net_config = openstack_tests.get_pub_net_config(
-                net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet',
+                project_name=self.os_creds.project_name,
+                net_name=guid + '-pub-net',
+                mtu=1442, subnet_name=guid + '-pub-subnet',
                 router_name=guid + '-pub-router',
                 external_net=self.ext_net_name)
 
@@ -104,11 +105,12 @@ class AnsibleProvisioningTests(OSIntegrationTestCase):
             self.router_creator.create()
 
             # Create Flavor
+            flavor_config = openstack_tests.get_flavor_config(
+                name=guid + '-flavor-name', ram=2048, disk=10,
+                vcpus=2, metadata=self.flavor_metadata)
+
             self.flavor_creator = create_flavor.OpenStackFlavor(
-                self.admin_os_creds,
-                FlavorConfig(
-                    name=guid + '-flavor-name', ram=2048, disk=10, vcpus=2,
-                    metadata=self.flavor_metadata))
+                self.admin_os_creds, flavor_config)
             self.flavor_creator.create()
 
             # Create Key/Pair
@@ -263,8 +265,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase):
 
         relative_pb_path = pkg_resources.resource_filename(
             'snaps.provisioning.tests.playbooks', 'simple_playbook.yml')
-        retval = self.inst_creator.apply_ansible_playbook(relative_pb_path)
-        self.assertEqual(0, retval)
+        self.inst_creator.apply_ansible_playbook(relative_pb_path)
 
         ssh = ansible_utils.ssh_client(
             ip, user, private_key_filepath=priv_key,
@@ -330,9 +331,8 @@ class AnsibleProvisioningTests(OSIntegrationTestCase):
         relative_pb_path = pkg_resources.resource_filename(
             'snaps.provisioning.tests.playbooks',
             'template_playbook.yml')
-        retval = self.inst_creator.apply_ansible_playbook(
+        self.inst_creator.apply_ansible_playbook(
             relative_pb_path, variables={'name': 'Foo'})
-        self.assertEqual(0, retval)
 
         ssh = ansible_utils.ssh_client(
             ip, user, private_key_filepath=priv_key,