Adding resources for Service Plan and the equivalent unit tests

Author: josemacassan

tests/integration/conftest.py

@@ -150,7 +150,7 @@ def account_user(account,account_user_params) -> AccountUser:
     cleanup(user)
 
 @pytest.fixture(scope='module')
-def service_plan_params() -> dict:
+def service_plan_params(service) -> dict:
     suffix = get_suffix()
     return dict(name=f"test-{suffix}")
 

tests/integration/test_integration_service_plans.py

@@ -0,0 +1,36 @@
+import pytest
+
+
+from tests.integration.conftest import service
+from threescale_api.errors import ApiClientError
+
+from tests.integration import asserts
+
+def test_list_service_plans(service, service_plan):
+    resource = service.service_plans.list()
+    assert len(resource) >= 1
+
+def test_check_service_plan_creation(service, service_plan, service_plan_params):
+    asserts.assert_resource(service_plan)
+    asserts.assert_resource_params(service_plan, service_plan_params)
+    assert service_plan.exists()
+
+def test_read_service_plans(service, service_plan, service_plan_params):
+    asserts.assert_resource(service_plan)
+    resource = service.service_plans.read(service_plan.entity_id)
+    asserts.assert_resource(resource)
+    asserts.assert_resource_params(service_plan,service_plan_params)
+
+def test_update_service_plans(service, service_plan, service_plan_params):
+    asserts.assert_resource(service_plan)
+    service_plan['state'] = 'publish'
+    service_plan['approval_required'] = True
+    resource = service.service_plans.update(service_plan.entity_id, service_plan_params)
+    asserts.assert_resource(resource)
+    asserts.assert_resource_params(service_plan, service_plan_params)
+
+def test_set_default_service_plan(service, service_plan, service_plan_params):
+    asserts.assert_resource(service_plan)
+    resource = service_plan.set_default()
+    asserts.assert_resource(resource)
+    asserts.assert_resource_params(service_plan, service_plan_params)

tests/integration/test_integration_service_subscriptions.py

@@ -11,30 +11,13 @@ def test_list_service_subscriptions(account, service_subscription):
     assert len(resource) >= 1
 
 def test_should_create_service_subscription(account, service_subscription, service_subscription_params):
-
     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.read(service_subscription.entity_id)
     asserts.assert_resource(resource)
     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
-#    resource = account.service_subscriptions.update(service_subscription.entity_id, service_subscription_params)
-#    asserts.assert_resource(resource)
-#    asserts.assert_resource_params(resource, service_subscription_params, [param for param in service_subscription_params.keys() if param != 'id'])
-#    resource_updated = account.service_subscription.read(params=service_subscription_params)
-#    asserts.assert_resource(resource_updated)
-#    asserts.assert_resource_params(resource_updated, service_subscription_params, [param for param in service_subscription_params.keys() if param != 'id'])
-
-#def test_should_approve_service_subscription(account, service_subscription, service_subscription_params):
-#    resource = account.service_subscriptions.approve_service_subscription(params=service_subscription_params)
-#    asserts.assert_resource(resource)
-#    read = account.service_subscriptions.read(service_subscription.entity_id)
-#    asserts.assert_resource(read)
 
 

threescale_api/resources.py

@@ -273,6 +273,7 @@ def pending(self, entity_id, **kwargs) -> 'Account':
         """
         return self.set_state(entity_id=entity_id, state='make_pending', **kwargs)
 
+
 class ServiceSubscriptions(DefaultClient):
 
     def __init__(self, *args, entity_name='service_subscription',
@@ -298,6 +299,7 @@ def change_plan_service_subscription(self, entity_id: int, plan_id: int, **kwarg
         instance = utils.extract_response(response=response)
         return instance
 
+
 class ServicePlans(DefaultClient):
 
     def __init__(self, *args, entity_name='service_plan',
@@ -309,6 +311,11 @@ def __init__(self, *args, entity_name='service_plan',
     def url(self) -> str:
         return self.parent.url + '/service_plans'
 
+    def service_plan_set_default(self, entity_id: int, **kwargs):
+        url = self.url + f"/{entity_id}/default"
+        response = self.rest.put(url=url, **kwargs)
+        instance = self._create_instance(response=response)
+        return instance
 
 
 class Applications(DefaultStateClient):
@@ -1175,6 +1182,7 @@ def service(self) -> 'Service':
     def backend(self) -> 'Backend':
         return self.metric.parent
 
+
 class ServiceSubscription(DefaultResource):
 
     def __init__(self, **kwargs):
@@ -1507,11 +1515,16 @@ def test_request(self, relpath=None, verify: bool = None):
 
         return client.get(relpath)
 
+
 class ServicePlan(DefaultResource):
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
+    def set_default(self, **kwargs):
+        return self.client.service_plan_set_default(entity_id=self.entity_id, **kwargs)
+
+
 class ApplicationKey(DefaultResource):
     def __init__(self, entity_name='', **kwargs):
         super().__init__(entity_name=entity_name, **kwargs)