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

Author: Dean Troyer

doc/source/backwards-incompatible.rst

@@ -30,7 +30,13 @@ Backwards Incompatible Changes
 Release 3.10
 ------------
 
-1. The positional argument ``<snapshot-name>`` of the ``volume snapshot create``
+1. The ``network create`` command now requires the ``--subnet`` option when used
+   with Nova-network clouds.
+
+  * As of: 3.10
+  * Commit: https://review.openstack.org/460679
+
+2. The positional argument ``<snapshot-name>`` of the ``volume snapshot create``
    command is no longer optional.
 
    Previously when the ``--volume`` option was

doc/source/command-objects/network.rst

@@ -71,6 +71,8 @@ Create new network
 
     Set network description
 
+    *Network version 2 only*
+
 .. option:: --availability-zone-hint <availability-zone>
 
     Availability Zone in which to create this network

openstackclient/api/compute_v2.py

@@ -202,24 +202,25 @@ def network_create(
     ):
         """Create a new network
 
-        https://developer.openstack.org/api-ref/compute/#create-project-network
+        https://developer.openstack.org/api-ref/compute/#create-network
 
         :param string name:
-            Network label
+            Network label (required)
         :param integer subnet:
-            Subnet for IPv4 fixed addresses in CIDR notation
+            Subnet for IPv4 fixed addresses in CIDR notation (required)
         :param integer share_subnet:
             Shared subnet between projects, True or False
         :returns: A dict of the network attributes
         """
 
-        url = "/os-tenant-networks"
+        url = "/os-networks"
 
         params = {
             'label': name,
             'cidr': subnet,
-            'share_address': share_subnet,
         }
+        if share_subnet is not None:
+            params['share_address'] = share_subnet
 
         return self.create(
             url,
@@ -232,13 +233,13 @@ def network_delete(
     ):
         """Delete a network
 
-        https://developer.openstack.org/api-ref/compute/#delete-project-network
+        https://developer.openstack.org/api-ref/compute/#delete-network
 
         :param string network:
             Network name or ID
         """
 
-        url = "/os-tenant-networks"
+        url = "/os-networks"
 
         network = self.find(
             url,
@@ -256,14 +257,14 @@ def network_find(
     ):
         """Return a network given name or ID
 
-        https://developer.openstack.org/api-ref/compute/#show-project-network-details
+        https://developer.openstack.org/api-ref/compute/#show-network-details
 
         :param string network:
             Network name or ID
         :returns: A dict of the network attributes
         """
 
-        url = "/os-tenant-networks"
+        url = "/os-networks"
 
         return self.find(
             url,
@@ -276,13 +277,13 @@ def network_list(
     ):
         """Get networks
 
-        https://developer.openstack.org/api-ref/compute/#list-project-networks
+        https://developer.openstack.org/api-ref/compute/#list-networks
 
         :returns:
             list of networks
         """
 
-        url = "/os-tenant-networks"
+        url = "/os-networks"
 
         return self.list(url)["networks"]
 

openstackclient/network/v2/network.py

@@ -42,7 +42,7 @@ def _format_router_external(item):
 }
 
 
-def _get_network_columns(item):
+def _get_columns_network(item):
     column_map = {
         'subnet_ids': 'subnets',
         'is_admin_state_up': 'admin_state_up',
@@ -59,14 +59,14 @@ def _get_network_columns(item):
     return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
 
 
-def _get_columns(item):
+def _get_columns_compute(item):
     column_map = {
         'tenant_id': 'project_id',
     }
     return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
 
 
-def _get_attrs(client_manager, parsed_args):
+def _get_attrs_network(client_manager, parsed_args):
     attrs = {}
     if parsed_args.name is not None:
         attrs['name'] = str(parsed_args.name)
@@ -135,6 +135,19 @@ def _get_attrs(client_manager, parsed_args):
     return attrs
 
 
+def _get_attrs_compute(client_manager, parsed_args):
+    attrs = {}
+    if parsed_args.name is not None:
+        attrs['name'] = str(parsed_args.name)
+    if parsed_args.share:
+        attrs['share_subnet'] = True
+    if parsed_args.no_share:
+        attrs['share_subnet'] = False
+    if parsed_args.subnet is not None:
+        attrs['subnet'] = parsed_args.subnet
+    return attrs
+
+
 def _add_additional_network_options(parser):
     # Add additional network options
 
@@ -168,19 +181,6 @@ def _add_additional_network_options(parser):
         help=_("Do not make the network VLAN transparent"))
 
 
-def _get_attrs_compute(client_manager, parsed_args):
-    attrs = {}
-    if parsed_args.name is not None:
-        attrs['name'] = str(parsed_args.name)
-    if parsed_args.share:
-        attrs['share_subnet'] = True
-    if parsed_args.no_share:
-        attrs['share_subnet'] = False
-    if parsed_args.subnet is not None:
-        attrs['subnet'] = parsed_args.subnet
-    return attrs
-
-
 # TODO(sindhu): Use the SDK resource mapped attribute names once the
 # OSC minimum requirements include SDK 1.0.
 class CreateNetwork(common.NetworkAndComputeShowOne):
@@ -289,21 +289,22 @@ def update_parser_compute(self, parser):
         parser.add_argument(
             '--subnet',
             metavar='<subnet>',
+            required=True,
             help=_("IPv4 subnet for fixed IPs (in CIDR notation)")
         )
         return parser
 
     def take_action_network(self, client, parsed_args):
-        attrs = _get_attrs(self.app.client_manager, parsed_args)
+        attrs = _get_attrs_network(self.app.client_manager, parsed_args)
         obj = client.create_network(**attrs)
-        display_columns, columns = _get_network_columns(obj)
+        display_columns, columns = _get_columns_network(obj)
         data = utils.get_item_properties(obj, columns, formatters=_formatters)
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
         attrs = _get_attrs_compute(self.app.client_manager, parsed_args)
         obj = client.api.network_create(**attrs)
-        display_columns, columns = _get_columns(obj)
+        display_columns, columns = _get_columns_compute(obj)
         data = utils.get_dict_properties(obj, columns)
         return (display_columns, data)
 
@@ -660,7 +661,7 @@ def take_action(self, parsed_args):
         client = self.app.client_manager.network
         obj = client.find_network(parsed_args.network, ignore_missing=False)
 
-        attrs = _get_attrs(self.app.client_manager, parsed_args)
+        attrs = _get_attrs_network(self.app.client_manager, parsed_args)
         client.update_network(obj, **attrs)
 
 
@@ -677,12 +678,12 @@ def update_parser_common(self, parser):
 
     def take_action_network(self, client, parsed_args):
         obj = client.find_network(parsed_args.network, ignore_missing=False)
-        display_columns, columns = _get_network_columns(obj)
+        display_columns, columns = _get_columns_network(obj)
         data = utils.get_item_properties(obj, columns, formatters=_formatters)
         return (display_columns, data)
 
     def take_action_compute(self, client, parsed_args):
         obj = client.api.network_find(parsed_args.network)
-        display_columns, columns = _get_columns(obj)
+        display_columns, columns = _get_columns_compute(obj)
         data = utils.get_dict_properties(obj, columns)
         return (display_columns, data)