Remove old code after sdk integration

We won't need this anymore.

Change-Id: Ib10be1dedb8db81f0cba6e45b8a9b0aade2ab473

4 files changed, 0 insertions, 120 deletions

diff --git a/openstackclient/api/network_v2.py b/openstackclient/api/network_v2.py
deleted file mode 100644
index 90be5237..00000000
--- a/openstackclient/api/network_v2.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#   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.
-#
-
-"""Network v2 API Library"""
-
-from openstackclient.api import api
-
-
-class APIv2(api.BaseAPI):
-    """Network v2 API"""
-
-    def __init__(self, **kwargs):
-        super(APIv2, self).__init__(**kwargs)
-
-    def dhcp_agent_list(
-        self,
-        dhcp_id=None,
-        **filter
-    ):
-        """List DHCP agents
-
-        :param string dhcp_id:
-            DHCP Agent ID
-        :param filter:
-            used to create the query string filters
-            http://docs.openstack.org/api/openstack-network/2.0/content/filtering.html
-        """
-
-        return self.list('dhcp-networks', **filter)['dhcp-networks']
-
-    def network_list(
-        self,
-        external=False,
-        **filter
-    ):
-        """List external networks
-
-        :param string dhcp_id:
-            DHCP agent ID
-        :param bool external:
-            Return external networks if True
-        :param filter:
-            used to create the query string filters
-            http://docs.openstack.org/api/openstack-network/2.0/content/filtering.html
-        """
-
-        if external:
-            filter = {'router:external': True}
-        return self.list('networks', **filter)['networks']
diff --git a/openstackclient/tests/api/test_network_v2.py b/openstackclient/tests/api/test_network_v2.py
deleted file mode 100644
index 80f1d9de..00000000
--- a/openstackclient/tests/api/test_network_v2.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#   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.
-#
-
-"""Network v2 API Library Tests"""
-
-from requests_mock.contrib import fixture
-
-from keystoneauth1 import session
-from openstackclient.api import network_v2 as network
-from openstackclient.tests import utils
-
-
-FAKE_PROJECT = 'xyzpdq'
-FAKE_URL = 'http://gopher.com/v2/' + FAKE_PROJECT
-
-
-class TestNetworkAPIv2(utils.TestCase):
-
-    def setUp(self):
-        super(TestNetworkAPIv2, self).setUp()
-        sess = session.Session()
-        self.api = network.APIv2(session=sess, endpoint=FAKE_URL)
-        self.requests_mock = self.useFixture(fixture.Fixture())
-
-
-class TestNetwork(TestNetworkAPIv2):
-
-    LIST_NETWORK_RESP = [
-        {'id': '1', 'name': 'p1', 'description': 'none', 'enabled': True},
-        {'id': '2', 'name': 'p2', 'description': 'none', 'enabled': False},
-        {'id': '3', 'name': 'p3', 'description': 'none', 'enabled': True},
-    ]
-
-    def test_network_list_no_options(self):
-        self.requests_mock.register_uri(
-            'GET',
-            FAKE_URL + '/networks',
-            json={'networks': self.LIST_NETWORK_RESP},
-            status_code=200,
-        )
-        ret = self.api.network_list()
-        self.assertEqual(self.LIST_NETWORK_RESP, ret)
diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py
index 9e999114..abb88ee4 100644
--- a/openstackclient/tests/network/v2/fakes.py
+++ b/openstackclient/tests/network/v2/fakes.py
@@ -16,7 +16,6 @@ import copy
 import mock
 import uuid
 
-from openstackclient.api import network_v2
 from openstackclient.tests import fakes
 from openstackclient.tests import utils
 
@@ -57,11 +56,6 @@ class TestNetworkV2(utils.TestCommand):
             token=fakes.AUTH_TOKEN,
         )
 
-        self.app.client_manager.network.api = network_v2.APIv2(
-            session=mock.Mock(),
-            service_type="network",
-        )
-
 
 class FakeNetwork(object):
     """Fake one or more networks."""
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index f0873656..4c897bcb 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -32,9 +32,6 @@ class TestNetwork(network_fakes.TestNetworkV2):
         # Get a shortcut to the network client
         self.network = self.app.client_manager.network
 
-        # Get a shortcut to the APIManager
-        self.api = self.app.client_manager.network.api
-
 
 class TestCreateNetworkIdentityV3(TestNetwork):