Merge "Fix: set invalid None project_id on range creation"

Zuul · openstack-gerrit · commit 25ea59e8d0d1 · 2019-03-15T15:52:46.000Z
diff --git a/openstackclient/network/v2/network_segment_range.py b/openstackclient/network/v2/network_segment_range.py
@@ -207,8 +207,6 @@ def take_action(self, parsed_args):
             # is not specified.
             # Get the project id from the current auth.
             attrs['project_id'] = self.app.client_manager.auth_ref.project_id
-        else:
-            attrs['project_id'] = None
 
         if parsed_args.physical_network:
             attrs['physical_network'] = parsed_args.physical_network
diff --git a/openstackclient/tests/unit/network/v2/test_network_segment_range.py b/openstackclient/tests/unit/network/v2/test_network_segment_range.py
@@ -144,19 +144,19 @@ def test_create_tunnel_with_physical_network(self):
                           self.cmd.take_action,
                           parsed_args)
 
-    def test_create_minimum_options(self):
+    def test_create_private_minimum_options(self):
         arglist = [
             '--private',
             '--project', self._network_segment_range.project_id,
-            '--network-type', self._network_segment_range.network_type,
+            '--network-type', 'vxlan',
             '--minimum', str(self._network_segment_range.minimum),
             '--maximum', str(self._network_segment_range.maximum),
             self._network_segment_range.name,
         ]
         verifylist = [
-            ('shared', self._network_segment_range.shared),
+            ('shared', False),
             ('project', self._network_segment_range.project_id),
-            ('network_type', self._network_segment_range.network_type),
+            ('network_type', 'vxlan'),
             ('minimum', self._network_segment_range.minimum),
             ('maximum', self._network_segment_range.maximum),
             ('name', self._network_segment_range.name),
@@ -166,9 +166,39 @@ def test_create_minimum_options(self):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.network.create_network_segment_range.assert_called_once_with(**{
-            'shared': self._network_segment_range.shared,
+            'shared': False,
             'project_id': mock.ANY,
-            'network_type': self._network_segment_range.network_type,
+            'network_type': 'vxlan',
+            'minimum': self._network_segment_range.minimum,
+            'maximum': self._network_segment_range.maximum,
+            'name': self._network_segment_range.name,
+        })
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
+
+    def test_create_shared_minimum_options(self):
+        arglist = [
+            '--shared',
+            '--network-type', 'vxlan',
+            '--minimum', str(self._network_segment_range.minimum),
+            '--maximum', str(self._network_segment_range.maximum),
+            self._network_segment_range.name,
+        ]
+        verifylist = [
+            ('shared', True),
+            ('network_type', 'vxlan'),
+            ('minimum', self._network_segment_range.minimum),
+            ('maximum', self._network_segment_range.maximum),
+            ('name', self._network_segment_range.name),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network.create_network_segment_range.assert_called_once_with(**{
+            'shared': True,
+            'network_type': 'vxlan',
             'minimum': self._network_segment_range.minimum,
             'maximum': self._network_segment_range.maximum,
             'name': self._network_segment_range.name,
