Add network service provider list to OSC

Add network service providers commands to OSC

Change-Id: Iea8bbe460061d67e36a4346b349e07612112c732
Depends-On: Ie0be92e0717b8b13e31068276a12b5fbf784e374

3 files changed, 132 insertions, 0 deletions

diff --git a/openstackclient/tests/functional/network/v2/test_network_service_provider.py b/openstackclient/tests/functional/network/v2/test_network_service_provider.py
new file mode 100644
index 00000000..379de430
--- /dev/null
+++ b/openstackclient/tests/functional/network/v2/test_network_service_provider.py
@@ -0,0 +1,26 @@
+# Copyright (c) 2016, Intel Corporation.
+# All Rights Reserved.
+#
+#    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 openstackclient.tests.functional import base
+
+
+class TestNetworkServiceProvider(base.TestCase):
+    """Functional tests for network service provider"""
+
+    SERVICE_TYPE = ['L3_ROUTER_NAT']
+
+    def test_network_service_provider_list(self):
+        raw_output = self.openstack('network service provider list')
+        self.assertIn(self.SERVICE_TYPE, raw_output)
diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py
index cea00282..e296ba72 100644
--- a/openstackclient/tests/unit/network/v2/fakes.py
+++ b/openstackclient/tests/unit/network/v2/fakes.py
@@ -1107,3 +1107,38 @@ class FakeSubnetPool(object):
         if subnet_pools is None:
             subnet_pools = FakeSubnetPool.create_subnet_pools(count)
         return mock.Mock(side_effect=subnet_pools)
+
+
+class FakeNetworkServiceProvider(object):
+    """Fake Network Service Providers"""
+
+    @staticmethod
+    def create_one_network_service_provider(attrs=None):
+        """Create service provider"""
+        attrs = attrs or {}
+
+        service_provider = {
+            'name': 'provider-name-' + uuid.uuid4().hex,
+            'service_type': 'service-type-' + uuid.uuid4().hex,
+            'default': False,
+        }
+
+        service_provider.update(attrs)
+
+        provider = fakes.FakeResource(
+            info=copy.deepcopy(service_provider),
+            loaded=True)
+        provider.is_default = service_provider['default']
+
+        return provider
+
+    @staticmethod
+    def create_network_service_providers(attrs=None, count=2):
+        """Create multiple service providers"""
+
+        service_providers = []
+        for i in range(0, count):
+            service_providers.append(FakeNetworkServiceProvider.
+                                     create_one_network_service_provider(
+                                         attrs))
+        return service_providers
diff --git a/openstackclient/tests/unit/network/v2/test_network_service_provider.py b/openstackclient/tests/unit/network/v2/test_network_service_provider.py
new file mode 100644
index 00000000..5ba85ddb
--- /dev/null
+++ b/openstackclient/tests/unit/network/v2/test_network_service_provider.py
@@ -0,0 +1,71 @@
+# Copyright (c) 2016, Intel Corporation.
+# All Rights Reserved.
+#
+#    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 mock
+
+from openstackclient.network.v2 import network_service_provider \
+    as service_provider
+from openstackclient.tests.unit.network.v2 import fakes
+
+
+class TestNetworkServiceProvider(fakes.TestNetworkV2):
+
+    def setUp(self):
+        super(TestNetworkServiceProvider, self).setUp()
+        self.network = self.app.client_manager.network
+
+
+class TestListNetworkServiceProvider(TestNetworkServiceProvider):
+    provider_list = \
+        fakes.FakeNetworkServiceProvider.create_network_service_providers(
+            count=2
+        )
+
+    columns = (
+        'Service Type',
+        'Name',
+        'Default',
+    )
+
+    data = []
+
+    for provider in provider_list:
+        data.append((
+            provider.service_type,
+            provider.name,
+            provider.is_default,
+        ))
+
+    def setUp(self):
+        super(TestListNetworkServiceProvider, self).setUp()
+        self.network.service_providers = mock.Mock(
+            return_value=self.provider_list
+        )
+
+        self.cmd = \
+            service_provider.ListNetworkServiceProvider(self.app,
+                                                        self.namespace)
+
+    def test_network_service_provider_list(self):
+        arglist = []
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network.service_providers.assert_called_with()
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, list(data))