Update tests for test_integration_service_subscriptions. Add Service Plan resources.

Author: josemacassan

tests/integration/conftest.py

@@ -13,7 +13,8 @@
                                       Proxy, Backend, Metric, MappingRule,
                                       BackendMappingRule, Account, BackendUsage,
                                       ActiveDoc, Webhooks, InvoiceState,
-                                      ApplicationKey, ApplicationPlans, AccountUser, AccountUsers, ServiceSubscription)
+                                      ApplicationKey, ApplicationPlans, AccountUser, AccountUsers, ServiceSubscription,
+                                      ServicePlan)
 
 load_dotenv()
 
@@ -149,9 +150,20 @@ def account_user(account,account_user_params) -> AccountUser:
     cleanup(user)
 
 @pytest.fixture(scope='module')
-def service_subscription_params(account) -> dict:
-    #suffix = get_suffix()
-    return dict(plan_id=account['id'])
+def service_plan_params() -> dict:
+    suffix = get_suffix()
+    return dict(name=f"test-{suffix}")
+
+@pytest.fixture(scope='module')
+def service_plan(service, service_plan_params) -> ServicePlan:
+
+    resource = service.service_plans.create(params=service_plan_params)
+    yield resource
+
+@pytest.fixture(scope='module')
+def service_subscription_params(service_plan) -> dict:
+    suffix = get_suffix()
+    return dict(plan_id=service_plan['id'])
 
 @pytest.fixture(scope='module')
 def service_subscription(account, service_subscription_params) -> ServiceSubscription:

tests/integration/test_integration_service_subscriptions.py

@@ -6,17 +6,21 @@
 
 from tests.integration import asserts
 
+def test_list_service_subscriptions(account, service_subscription):
+    resource = account.service_subscriptions.list()
+    assert len(resource) >= 1
+
 def test_should_create_service_subscription(account, service_subscription, service_subscription_params):
 
-    account.service_subscriptions.create(params=service_subscription_params)
-    resource = service_subscription.get(service_subscription_params)
-    asserts.assert_resource(resource)
-    asserts.assert_resource_params(account, service_subscription_params, [param for param in service_subscription_params.keys() if param != 'id'])
+    asserts.assert_resource(service_subscription)
+    asserts.assert_resource_params(service_subscription, service_subscription_params)
 
 def test_should_read_service_subscription(account, service_subscription, service_subscription_params):
-    resource = account.service_subscriptions.get(params=service_subscription_params)
+
+
+    resource = account.service_subscriptions.read(service_subscription.entity_id)
     asserts.assert_resource(resource)
-    asserts.assert_resource_params(resource, service_subscription_params, [param for param in service_subscription_params.keys() if param != 'id'])
+    asserts.assert_resource_params(service_subscription,service_subscription_params)
 
 #def test_should_update_service_subscription(account, service_subscription, service_subscription_params):
 #    service_subscription_params['plan_id'] = 100
@@ -33,7 +37,4 @@ def test_should_read_service_subscription(account, service_subscription, service
 #    read = account.service_subscriptions.read(service_subscription.entity_id)
 #    asserts.assert_resource(read)
 
-def test_list_service_subscriptions(account):
-    resource = account.service_subscriptions.list()
-    assert len(resource) >= 1
 

threescale_api/resources.py

@@ -305,30 +305,10 @@ def __init__(self, *args, entity_name='service_plan',
         super().__init__(*args, entity_name=entity_name,
                          entity_collection=entity_collection, **kwargs)
 
+    @property
     def url(self) -> str:
-        if type(self.parent) is Service:
-            return self.parent.url + '/service_plans'
-        return self.threescale_client.admin_api_url + '/service_plans'
-
-    def service_plans_features_list(self, entity_id: int, **kwargs):
-        url = self.url + f"/{entity_id}/features.xml"
-        response = self.rest.get(url=url)
-        instance = utils.extract_response(response)
-        return instance
-
-    def service_plan_add_feature(self, entity_id: int, feature_id: int, **kwargs):
-        params = dict(feature_id=feature_id)
-        url = self.url + f"/{entity_id}/features.xml"
-        response = self.rest.post(url=url, json=params, **kwargs)
-        instance = utils.extract_response(response=response)
-        return instance
+        return self.parent.url + '/service_plans'
 
-    def service_plan_delete_feature(self, entity_id: int, id: int, **kwargs):
-        params = dict(id=id)
-        url = self.url + f"/{entity_id}/features/{id}.xml"
-        response = self.rest.delete(url=url, json=params, **kwargs)
-        instance = utils.extract_response(response=response)
-        return instance
 
 
 class Applications(DefaultStateClient):
@@ -1532,19 +1512,6 @@ class ServicePlan(DefaultResource):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-    def service_plan_list(self, **kwargs):
-        return self.client.service_plan_list(self, **kwargs)
-
-    def service_plan_features_list(self, entity_id: int, **kwargs):
-        return self.client.service_plan_features_list(entity_id=self.entity_id, **kwargs)
-
-    def service_plan_add_feature(self, entity_id: int, id: int, **kwargs):
-        return self.client.service_plan_add_feature(entity_id=id, id=id, **kwargs)
-
-    def service_plan_delete_feature(self, entity_id: int, id: int, **kwargs):
-        return self.client.service_plan_delete_feature(entity_id=entity_id, id=id, **kwargs)
-
-
 class ApplicationKey(DefaultResource):
     def __init__(self, entity_name='', **kwargs):
         super().__init__(entity_name=entity_name, **kwargs)