# 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.

import six

from openstack.tests.functional import base


class TestServiceProvider(base.BaseFunctionalTest):
    def test_list(self):
        providers = list(self.conn.network.service_providers())

        for provide in providers:
            self.assertIsInstance(provide.name, six.string_type)
            self.assertIsInstance(provide.service_type, six.string_types)

@@ -543,20 +543,8 @@
 e.%0A%0A
-import six%0A%0A
 from
@@ -726,25 +726,24 @@
 ders())%0A
-%0A
         
 for prov
@@ -738,19 +738,89 @@
     
-for provide
+names = %5Bo.name for o in providers%5D%0A        service_types = %5Bo.service_type for o
  in 
@@ -832,20 +832,18 @@
 ders
-:%0A  
+%5D%0A
         
   se
@@ -830,34 +830,32 @@
 viders%5D%0A        
-  
 self.assertIsIns
@@ -854,59 +854,31 @@
 ertI
-sInstance(provide.name, six.string_type)%0A  
+n('ha', names)%0A
         
   se
@@ -869,26 +869,24 @@
 es)%0A        
-  
 self.assertI
@@ -889,50 +889,34 @@
 ertI
-sInstance(provide.service_type, six.string
+n('L3_ROUTER_NAT', service
 _typ

Fix the network service provider test