
from tempest_lib import decorators

from neutron.tests.api import base
from neutron.tests.tempest import test


class ServiceTypeManagementTestJSON(base.BaseNetworkTest):

    @classmethod
    def resource_setup(cls):
        super(ServiceTypeManagementTestJSON, cls).resource_setup()
        if not test.is_extension_enabled('service-type', 'network'):
            msg = "Neutron Service Type Management not enabled."
            raise cls.skipException(msg)

    @decorators.skip_because(bug="1400370")
    @test.attr(type='smoke')
    @test.idempotent_id('2cbbeea9-f010-40f6-8df5-4eaa0c918ea6')
    def test_service_provider_list(self):
        body = self.client.list_service_providers()
        self.assertIsInstance(body['service_providers'], list)


from neutron.tests.api import base
from neutron.tests.tempest import test


class ServiceTypeManagementTest(base.BaseNetworkTest):

    @classmethod
    def resource_setup(cls):
        super(ServiceTypeManagementTest, cls).resource_setup()
        if not test.is_extension_enabled('service-type', 'network'):
            msg = "Neutron Service Type Management not enabled."
            raise cls.skipException(msg)

    @test.attr(type='smoke')
    @test.idempotent_id('2cbbeea9-f010-40f6-8df5-4eaa0c918ea6')
    def test_service_provider_list(self):
        body = self.client.list_service_providers()
        self.assertIsInstance(body['service_providers'], list)

Remove skip of service-type management API test
Remove skip of service-type management API test

Advanced services split is complete so remove the skip
for the service-type management API test.

(Yes, there is only one placeholder test. More tests
need to be developed.)

Also remove the obsolete 'JSON' suffix from the test
class.

Closes-bug: 1400370

Change-Id: I5b4b8a67b24595568ea13bc400c1f5fce6d40f28

- 
- from tempest_lib import decorators
  
  from neutron.tests.api import base
  from neutron.tests.tempest import test
  
  
- class ServiceTypeManagementTestJSON(base.BaseNetworkTest):
+ class ServiceTypeManagementTest(base.BaseNetworkTest):
  
      @classmethod
      def resource_setup(cls):
-         super(ServiceTypeManagementTestJSON, cls).resource_setup()
+         super(ServiceTypeManagementTest, cls).resource_setup()
          if not test.is_extension_enabled('service-type', 'network'):
              msg = "Neutron Service Type Management not enabled."
              raise cls.skipException(msg)
  
-     @decorators.skip_because(bug="1400370")
      @test.attr(type='smoke')
      @test.idempotent_id('2cbbeea9-f010-40f6-8df5-4eaa0c918ea6')
      def test_service_provider_list(self):
          body = self.client.list_service_providers()
          self.assertIsInstance(body['service_providers'], list)
  
Remove skip of service-type management API test
## Code Before:

from tempest_lib import decorators

from neutron.tests.api import base
from neutron.tests.tempest import test


class ServiceTypeManagementTestJSON(base.BaseNetworkTest):

    @classmethod
    def resource_setup(cls):
        super(ServiceTypeManagementTestJSON, cls).resource_setup()
        if not test.is_extension_enabled('service-type', 'network'):
            msg = "Neutron Service Type Management not enabled."
            raise cls.skipException(msg)

    @decorators.skip_because(bug="1400370")
    @test.attr(type='smoke')
    @test.idempotent_id('2cbbeea9-f010-40f6-8df5-4eaa0c918ea6')
    def test_service_provider_list(self):
        body = self.client.list_service_providers()
        self.assertIsInstance(body['service_providers'], list)

## Instruction:
Remove skip of service-type management API test
## Code After:

from neutron.tests.api import base
from neutron.tests.tempest import test


class ServiceTypeManagementTest(base.BaseNetworkTest):

    @classmethod
    def resource_setup(cls):
        super(ServiceTypeManagementTest, cls).resource_setup()
        if not test.is_extension_enabled('service-type', 'network'):
            msg = "Neutron Service Type Management not enabled."
            raise cls.skipException(msg)

    @test.attr(type='smoke')
    @test.idempotent_id('2cbbeea9-f010-40f6-8df5-4eaa0c918ea6')
    def test_service_provider_list(self):
        body = self.client.list_service_providers()
        self.assertIsInstance(body['service_providers'], list)
