Fix Nova-net netowrk commands

In cleaning up functional tests for nova-net, I discovered some
problems in network create:
* --subnet option is required in network create command
* Switch API to use /os-networks rather than /os-tenant-networks as this
  is what we were actually using via novaclient
* Fix functional tests for nova-net
* Normalize some private function names in network/v2/network.py

Change-Id: I426b864406756d58d140575a3a45ee9aee67ce84

1 files changed, 15 insertions, 15 deletions

diff --git a/openstackclient/tests/unit/api/test_compute_v2.py b/openstackclient/tests/unit/api/test_compute_v2.py
index 22ee4899..f10fb6cf 100644
--- a/openstackclient/tests/unit/api/test_compute_v2.py
+++ b/openstackclient/tests/unit/api/test_compute_v2.py
@@ -185,7 +185,7 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_create_default(self):
         self.requests_mock.register_uri(
             'POST',
-            FAKE_URL + '/os-tenant-networks',
+            FAKE_URL + '/os-networks',
             json={'network': self.FAKE_NETWORK_RESP},
             status_code=200,
         )
@@ -195,7 +195,7 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_create_options(self):
         self.requests_mock.register_uri(
             'POST',
-            FAKE_URL + '/os-tenant-networks',
+            FAKE_URL + '/os-networks',
             json={'network': self.FAKE_NETWORK_RESP},
             status_code=200,
         )
@@ -208,13 +208,13 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_delete_id(self):
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks/1',
+            FAKE_URL + '/os-networks/1',
             json={'network': self.FAKE_NETWORK_RESP},
             status_code=200,
         )
         self.requests_mock.register_uri(
             'DELETE',
-            FAKE_URL + '/os-tenant-networks/1',
+            FAKE_URL + '/os-networks/1',
             status_code=202,
         )
         ret = self.api.network_delete('1')
@@ -224,18 +224,18 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_delete_name(self):
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks/label1',
+            FAKE_URL + '/os-networks/label1',
             status_code=404,
         )
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks',
+            FAKE_URL + '/os-networks',
             json={'networks': self.LIST_NETWORK_RESP},
             status_code=200,
         )
         self.requests_mock.register_uri(
             'DELETE',
-            FAKE_URL + '/os-tenant-networks/1',
+            FAKE_URL + '/os-networks/1',
             status_code=202,
         )
         ret = self.api.network_delete('label1')
@@ -245,12 +245,12 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_delete_not_found(self):
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks/label3',
+            FAKE_URL + '/os-networks/label3',
             status_code=404,
         )
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks',
+            FAKE_URL + '/os-networks',
             json={'networks': self.LIST_NETWORK_RESP},
             status_code=200,
         )
@@ -263,7 +263,7 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_find_id(self):
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks/1',
+            FAKE_URL + '/os-networks/1',
             json={'network': self.FAKE_NETWORK_RESP},
             status_code=200,
         )
@@ -273,12 +273,12 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_find_name(self):
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks/label2',
+            FAKE_URL + '/os-networks/label2',
             status_code=404,
         )
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks',
+            FAKE_URL + '/os-networks',
             json={'networks': self.LIST_NETWORK_RESP},
             status_code=200,
         )
@@ -288,12 +288,12 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_find_not_found(self):
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks/label3',
+            FAKE_URL + '/os-networks/label3',
             status_code=404,
         )
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks',
+            FAKE_URL + '/os-networks',
             json={'networks': self.LIST_NETWORK_RESP},
             status_code=200,
         )
@@ -306,7 +306,7 @@ class TestNetwork(TestComputeAPIv2):
     def test_network_list_no_options(self):
         self.requests_mock.register_uri(
             'GET',
-            FAKE_URL + '/os-tenant-networks',
+            FAKE_URL + '/os-networks',
             json={'networks': self.LIST_NETWORK_RESP},
             status_code=200,
         )