CCE client fixes due to changes on cloud layer (#186)

CCE client fixes due to changes on cloud layer Reviewed-by: None <None> Reviewed-by: Rodion Gyrbu <[email protected]>
opentelekomcloud · Jun 10, 2021 · d78ae59 · d78ae59
1 parent 35080fb
commit d78ae59
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/otcextensions/osclient/cce/v2/cluster_node.py b/otcextensions/osclient/cce/v2/cluster_node.py
@@ -309,10 +309,11 @@ def get_parser(self, prog_name):
             help=_('Maximum number of pods on the node')
         )
         parser.add_argument(
-            '--network-id',
-            metavar='<network_id>',
+            '--network',
+            metavar='<network>',
             required=True,
-            help=_('ID of the network where the node will be created.')
+            help=_('ID or name of the network where the node will be '
+                   'created.')
         )
         parser.add_argument(
             '--node-image-id',
@@ -398,7 +399,7 @@ def take_action(self, parsed_args):
         attrs['cluster'] = parsed_args.cluster
         attrs['count'] = parsed_args.count
         attrs['flavor'] = parsed_args.flavor
-        attrs['network_id'] = parsed_args.network_id
+        attrs['network'] = parsed_args.network
         attrs['ssh_key'] = parsed_args.ssh_key
 
         # optional
@@ -428,8 +429,8 @@ def take_action(self, parsed_args):
             attrs['max_pods'] = parsed_args.max_pods
         if parsed_args.name:
             attrs['name'] = parsed_args.name
-        if parsed_args.network_id:
-            attrs['network_id'] = parsed_args.network_id
+        if parsed_args.network:
+            attrs['network'] = parsed_args.network
         if parsed_args.node_image_id:
             attrs['node_image_id'] = parsed_args.node_image_id
         if parsed_args.os:

diff --git a/otcextensions/osclient/cce/v2/node_pool.py b/otcextensions/osclient/cce/v2/node_pool.py
@@ -295,10 +295,10 @@ def get_parser(self, prog_name):
             help=_('Additional public key to be added to for login.')
         )
         parser.add_argument(
-            '--network-id',
-            metavar='<network_id>',
+            '--network',
+            metavar='<network>',
             required=True,
-            help=_('ID of the network to which the cluster node '
+            help=_('ID or name of the network to which the cluster node '
                    'will belong to.')
         )
         parser.add_argument(
@@ -359,7 +359,7 @@ def take_action(self, parsed_args):
         attrs['flavor'] = parsed_args.flavor
         attrs['os'] = parsed_args.os
         attrs['name'] = parsed_args.name
-        attrs['network_id'] = parsed_args.network_id
+        attrs['network'] = parsed_args.network
         attrs['ssh_key'] = parsed_args.ssh_key
 
         # optional

diff --git a/otcextensions/tests/unit/osclient/cce/v2/test_cluster_node.py b/otcextensions/tests/unit/osclient/cce/v2/test_cluster_node.py
@@ -87,7 +87,7 @@ def test_create(self):
             '--flavor', 'flvr',
             '--label', 'l1=v1',
             '--label', 'l2=v2',
-            '--network-id', 'nw',
+            '--network', 'nw',
             '--root-volume-size', '230',
             '--root-volume-type', 'SATA',
             '--ssh-key', 'key',
@@ -105,7 +105,7 @@ def test_create(self):
                 {'volumetype': 'SAS', 'size': '200'}]),
             ('flavor', 'flvr'),
             ('labels', {'l1': 'v1', 'l2': 'v2'}),
-            ('network_id', 'nw'),
+            ('network', 'nw'),
             ('root_volume_size', 230),
             ('root_volume_type', 'SATA'),
             ('ssh_key', 'key'),
@@ -127,7 +127,7 @@ def test_create(self):
             cluster='cluster_name',
             count=12,
             flavor='flvr',
-            network_id='nw',
+            network='nw',
             ssh_key='key',
             annotations={'a1': 'v1', 'a2': 'v2'},
             bandwidth=30,

diff --git a/otcextensions/tests/unit/osclient/cce/v2/test_node_pool.py b/otcextensions/tests/unit/osclient/cce/v2/test_node_pool.py
@@ -331,7 +331,7 @@ def test_create(self):
             'cluster_name',
             'pool_name',
             '--flavor', 'flav',
-            '--network-id', 'nw',
+            '--network', 'nw',
             '--os', 'CentOS',
             '--ssh-key', 'sshkey'
         ]
@@ -343,7 +343,7 @@ def test_create(self):
             ('az', 'random'),
             ('flavor', 'flav'),
             ('initial_node_count', 0),
-            ('network_id', 'nw'),
+            ('network', 'nw'),
             ('os', 'CentOS'),
             ('root_volume_size', 40),
             ('root_volume_type', 'SATA'),
@@ -366,7 +366,7 @@ def test_create(self):
             cluster='cluster_name',
             flavor='flav',
             name='pool_name',
-            network_id='nw',
+            network='nw',
             os='CentOS',
             root_volume_size=40,
             root_volume_type='SATA',