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

diff --git a/neutron/tests/api/test_service_type_management.py b/neutron/tests/api/test_service_type_management.py
index 7c68e8dd6260728b2003143a64534aa4023d9584..4bafb604f74101be67f73a8b4e10a5e9b6809fda 100644 (file)
--- a/neutron/tests/api/test_service_type_management.py
+++ b/neutron/tests/api/test_service_type_management.py
@@ -10,22 +10,19 @@
 #    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):
+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):