Merge "Make the flavor provider used in api tests configurable"

tests/api/base.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import uuid
 
 from cafe.drivers.unittest import fixtures
 import jsonschema
@@ -64,6 +65,23 @@ class TestBase(fixtures.BaseTestFixture):
         except jsonschema.ValidationError as message:
             assert False, message
 
+    @property
+    def test_flavor(self):
+        if self.test_config.generate_flavors:
+            provider_name = self.test_config.generated_provider
+            # create the flavor
+            flavor_id = str(uuid.uuid1())
+            self.client.create_flavor(
+                flavor_id=flavor_id,
+                provider_list=[{
+                    "provider": provider_name,
+                    "links": [{"href": "www.{0}.com".format(provider_name),
+                               "rel": "provider_url"}]}])
+        else:
+            flavor_id = self.test_config.default_flavor
+
+        return flavor_id
+
     @classmethod
     def tearDownClass(cls):
         """Deletes the added resources."""

tests/api/flavors/test_flavors.py

@@ -86,25 +86,7 @@ class TestFlavorActions(base.TestBase):
 
     def setUp(self):
         super(TestFlavorActions, self).setUp()
-        if self.test_config.generate_flavors:
-            self.flavor_id = str(uuid.uuid1())
-            self.provider_list = [
-                {
-                    "provider": "fastly",
-                    "links": [
-                        {
-                            "href": "www.fastly.com",
-                            "rel": "provider_url"
-                        }
-                    ]
-                }
-            ]
-
-            self.client.create_flavor(
-                flavor_id=self.flavor_id,
-                provider_list=self.provider_list)
-        else:
-            self.flavor_id = self.test_config.default_flavor
+        self.flavor_id = self.test_flavor
 
     @attrib.attr('smoke')
     def test_get_flavor(self):

tests/api/services/test_services.py

@@ -36,16 +36,7 @@ class TestCreateService(providers.TestProviderBase):
         super(TestCreateService, self).setUp()
         self.service_url = ''
         self.service_name = str(uuid.uuid1())
-        self.flavor_id = self.test_config.default_flavor
-
-        if self.test_config.generate_flavors:
-            # create the flavor
-            self.flavor_id = str(uuid.uuid1())
-            self.client.create_flavor(flavor_id=self.flavor_id,
-                                      provider_list=[{
-                                          "provider": "fastly",
-                                          "links": [{"href": "www.fastly.com",
-                                                     "rel": "provider_url"}]}])
+        self.flavor_id = self.test_flavor
 
     @attrib.attr('smoke')
     @ddt.file_data('data_create_service.json')
@@ -246,15 +237,7 @@ class TestListServices(base.TestBase):
     def setUp(self):
         super(TestListServices, self).setUp()
         self.service_list = []
-        if self.test_config.generate_flavors:
-            self.flavor_id = str(uuid.uuid1())
-            self.client.create_flavor(
-                flavor_id=self.flavor_id,
-                provider_list=[{"provider": "fastly",
-                                "links": [{"href": "www.fastly.com",
-                                           "rel": "provider_url"}]}])
-        else:
-            self.flavor_id = self.test_config.default_flavor
+        self.flavor_id = self.test_flavor
 
     @attrib.attr('smoke')
     def test_list_single_service(self):
@@ -338,16 +321,7 @@ class TestServiceActions(base.TestBase):
     def setUp(self):
         super(TestServiceActions, self).setUp()
         self.service_name = str(uuid.uuid1())
-        self.flavor_id = str(uuid.uuid1())
-        if self.test_config.generate_flavors:
-            self.flavor_id = str(uuid.uuid1())
-            self.client.create_flavor(
-                flavor_id=self.flavor_id,
-                provider_list=[{"provider": "fastly",
-                                "links": [{"href": "www.fastly.com",
-                                           "rel": "provider_url"}]}])
-        else:
-            self.flavor_id = self.test_config.default_flavor
+        self.flavor_id = self.test_flavor
 
         domain = str(uuid.uuid1()) + u'.com'
         self.domain_list = [
@@ -473,15 +447,7 @@ class TestServicePatch(base.TestBase):
     def setUp(self):
         super(TestServicePatch, self).setUp()
         self.service_name = str(uuid.uuid1())
-        if self.test_config.generate_flavors:
-            self.flavor_id = str(uuid.uuid1())
-            self.client.create_flavor(
-                flavor_id=self.flavor_id,
-                provider_list=[{"provider": "fastly",
-                                "links": [{"href": "www.fastly.com",
-                                           "rel": "provider_url"}]}])
-        else:
-            self.flavor_id = self.test_config.default_flavor
+        self.flavor_id = self.test_flavor
 
         domain = str(uuid.uuid1()) + '.com'
         self.domain_list = [{"domain": domain}]

tests/api/utils/config.py

@@ -62,6 +62,11 @@ class TestConfig(data_interfaces.ConfigSectionInterface):
         """String value to set the default flavor to use in tests."""
         return self.get('default_flavor')
 
+    @property
+    def generated_provider(self):
+        """String value to set the provider to use with generated flavor."""
+        return self.get('generated_provider')
+
     @property
     def project_id_in_url(self):
         """Flag to indicate if project_id should be present in the url."""

tests/etc/api.conf

@@ -18,7 +18,8 @@ status_check_retry_interval=2
 status_check_retry_timeout=30
 generate_flavors=False
 default_flavor=standard
-project_id_in_url = False
+generated_provider=fastly
+project_id_in_url=False
 
 [provider_1]
 api_key=INSERT_YOUR_API_KEY