CCE fixes for better CLI handling (#150)

CCE fixes for better CLI handling

Reviewed-by: Rodion Gyrbu <[email protected]>
Reviewed-by: Tino Schr <None>
Reviewed-by: None <None>
Reviewed-by: Anton Sidelnikov <None>

Author: tischrei

examples/cce/create_cluster_node.py

@@ -20,49 +20,67 @@
 
 
 attrs = {
-    "kind": "Node",
-    "apiVersion": "v3",
-    "metadata": {
-        "name": "myhost",
-        "labels": {
-            "foo": "bar"
+    'kind': 'Node',
+    'apiVersion': 'v3',
+    'metadata': {
+        'name': 'myhost',
+        'labels': {
+            'foo': 'bar'
         },
-        "annotations": {
-            "annotation1": "abc"
+        'annotations': {
+            'annotation1': 'abc'
         }
     },
-    "spec": {
-        "flavor": "s2.large.2",
-        "az": "eu-de-02",
-        "login": {
-            "sshKey": "keypair-pub"
+    'spec': {
+        'flavor': 's2.large.2',
+        'az': 'eu-de-02',
+        'login': {
+            'sshKey': 'keypair-pub'
         },
-        "rootVolume": {
-            "size": 40,
-            "volumetype": "SATA"
+        'rootVolume': {
+            'size': 40,
+            'volumetype': 'SATA'
         },
-        "dataVolumes": [
+        'dataVolumes': [
             {
-                "size": 100,
-                "volumetype": "SATA"
+                'size': 100,
+                'volumetype': 'SATA'
             }
         ],
-        "userTags": [
+        'userTags': [
             {
-                "key": "tag1",
-                "value": "aaaa"
+                'key': 'tag1',
+                'value': 'aaaa'
             },
             {
-                "key": "tag2",
-                "value": "bbbb"
+                'key': 'tag2',
+                'value': 'bbbb'
             }
         ],
-        "k8sTags": {
-            "label-test": "test"
+        'k8sTags': {
+            'label-test': 'test'
+        },
+        'publicIP': {
+            # ids: ['1234', '5678']
+            'count': 2,
+            'eip': {
+                'iptype': '5_bgp',
+                'bandwidth': {
+                    'chargemode': 'traffic',
+                    'size': 10,
+                    'sharetype': 'PER'
+                }
+            }
+        },
+        'count': 2,
+        'nodeNicSpec': {
+            'primaryNic': {
+                'subnetId': 'bbfc0a20-d66c-4f36-b4c1-265d669b8c62'
+            }
         },
-        "count": 1,
     }
 }
+
 cluster = 'name_or_id'
 cluster = conn.cce.find_cluster(name_or_id=cluster)
 conn.cce.create_cluster_node(cluster=cluster, **attrs)

otcextensions/osclient/cce/v2/cluster.py

@@ -32,12 +32,15 @@ def _flatten_cluster(obj):
         'status': obj.status.status,
         'type': obj.spec.type,
         'flavor': obj.spec.flavor,
-        'endpoint': obj.status.endpoints.get('external_otc'),
         'router_id': obj.spec.host_network.router_id,
         'network_id': obj.spec.host_network.network_id,
         'version': obj.spec.version
     }
 
+    endpoints = obj.status.get('endpoints')
+    if endpoints:
+        data['endpoint'] = endpoints.get('external_otc')
+
     return data
 
 
@@ -186,7 +189,7 @@ def get_parser(self, prog_name):
             metavar='{' + ','.join(CONTAINER_NET_MODE_CHOICES) + '}',
             type=lambda s: s.lower(),
             choices=CONTAINER_NET_MODE_CHOICES,
-            required=True,
+            default='overlay_l2',
             help=_('Container network mode.')
         )
         parser.add_argument(