diff options
Diffstat (limited to 'snaps/openstack/tests/cluster_template_tests.py')
-rw-r--r-- | snaps/openstack/tests/cluster_template_tests.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/snaps/openstack/tests/cluster_template_tests.py b/snaps/openstack/tests/cluster_template_tests.py index 355467d..eda790d 100644 --- a/snaps/openstack/tests/cluster_template_tests.py +++ b/snaps/openstack/tests/cluster_template_tests.py @@ -54,7 +54,8 @@ class CreateClusterTemplateTests(OSIntegrationTestCase): self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4()) self.cluster_type_name = self.guid + '-cluster-type' - self.magnum = magnum_utils.magnum_client(self.os_creds) + self.magnum = magnum_utils.magnum_client( + self.os_creds, self.os_session) metadata = self.image_metadata if not metadata: @@ -68,9 +69,10 @@ class CreateClusterTemplateTests(OSIntegrationTestCase): self.image_creator = OpenStackImage(self.os_creds, os_image_settings) - self.flavor_creator = OpenStackFlavor( - self.os_creds, FlavorConfig( - name=self.guid + '-flavor', ram=512, disk=10, vcpus=1)) + flavor_config = openstack_tests.get_flavor_config( + name=self.guid + '-flavor', ram=512, disk=10, + vcpus=1, metadata=self.flavor_metadata) + self.flavor_creator = OpenStackFlavor(self.os_creds, flavor_config) keypair_priv_filepath = 'tmp/' + self.guid keypair_pub_filepath = keypair_priv_filepath + '.pub' |