old_contents: #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  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)
  
new_contents: #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  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)
  
subject: Remove skip of service-type management API test