From da3a4156a23295077962b22d79ff85355ea1771d Mon Sep 17 00:00:00 2001
From: nmagnezi <nmagnezi@redhat.com>
Date: Tue, 30 Jun 2015 12:44:15 +0300
Subject: [PATCH] Revert "Add '--router:external' option to 'net-create'"

This reverts commit 096fd1b175085fcc3c46a248b4afb67561fd29ef.

In previous neutronclient versions, we allowed the following syntax to
set network as external: --router:external=False or --router:external=True.
Since Ibb100d54a5fd8b04ac5e1fc3a26826c695f4d951 was merged, this syntax
no longer works.

Conflicts:
	neutronclient/neutron/v2_0/network.py

Change-Id: Idbae5461dcaeff3da48d773e323977afcdc6f85e
Closes-Bug: #1451391
---
 neutronclient/neutron/v2_0/network.py          |  7 +------
 neutronclient/tests/unit/test_cli20_network.py | 14 --------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/neutronclient/neutron/v2_0/network.py b/neutronclient/neutron/v2_0/network.py
index 5338cf5..8884c79 100644
--- a/neutronclient/neutron/v2_0/network.py
+++ b/neutronclient/neutron/v2_0/network.py
@@ -120,11 +120,6 @@ class CreateNetwork(neutronV20.CreateCommand):
             action='store_true',
             help=_('Set the network as shared.'),
             default=argparse.SUPPRESS)
-        parser.add_argument(
-            '--router:external',
-            action='store_true',
-            help=_('Set network as external, it is only available for admin'),
-            default=argparse.SUPPRESS)
         parser.add_argument(
             '--provider:network_type',
             metavar='<network_type>',
@@ -154,7 +149,7 @@ class CreateNetwork(neutronV20.CreateCommand):
             'name': parsed_args.name,
             'admin_state_up': parsed_args.admin_state}, }
         neutronV20.update_dict(parsed_args, body['network'],
-                               ['shared', 'tenant_id', 'router:external',
+                               ['shared', 'tenant_id',
                                 'vlan_transparent',
                                 'provider:network_type',
                                 'provider:physical_network',
diff --git a/neutronclient/tests/unit/test_cli20_network.py b/neutronclient/tests/unit/test_cli20_network.py
index e0681d2..2d6edc5 100644
--- a/neutronclient/tests/unit/test_cli20_network.py
+++ b/neutronclient/tests/unit/test_cli20_network.py
@@ -103,20 +103,6 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base):
                                    position_names, position_values,
                                    tags=['a', 'b'])
 
-    def test_create_network_external(self):
-        """Create net: --router:external myname."""
-        resource = 'network'
-        cmd = network.CreateNetwork(test_cli20.MyApp(sys.stdout), None)
-        name = 'myname'
-        myid = 'myid'
-        args = [name, '--router:external']
-        position_names = ['name', ]
-        position_values = [name, ]
-        external = {'router:external': True}
-        self._test_create_resource(resource, cmd, name, myid, args,
-                                   position_names, position_values,
-                                   **external)
-
     def test_create_network_state(self):
         """Create net: --admin_state_down myname."""
         resource = 'network'