From 19099f5af4b31072562de07fa280810491ec0b41 Mon Sep 17 00:00:00 2001
From: "T. Schreiber" <tino.schreiber@t-systems.com>
Date: Mon, 6 Apr 2020 09:18:04 +0000
Subject: [PATCH] Update CCE cluster

---
 otcextensions/sdk/cce/v3/cluster.py                 | 7 ++++++-
 otcextensions/tests/unit/sdk/cce/v3/test_cluster.py | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/otcextensions/sdk/cce/v3/cluster.py b/otcextensions/sdk/cce/v3/cluster.py
index 03e20d743..2d56335ca 100644
--- a/otcextensions/sdk/cce/v3/cluster.py
+++ b/otcextensions/sdk/cce/v3/cluster.py
@@ -32,6 +32,9 @@ class ClusterSpec(resource.Resource):
 
     #: Authentication
     authentication = resource.Body('authentication', type=dict)
+    #: Single Master Cluster in one Availability Zone: ['eu-de-01']
+    #: Three Master Cluster in multiple Availability Zones: ['multi-az']
+    az = resource.Body('az')
     #: Billing mode of the cluster. Currently, only pay-per-use is supported.
     billing = resource.Body('billing_mode', type=int)
     #: Container network parameters.
@@ -44,9 +47,11 @@ class ClusterSpec(resource.Resource):
     flavor = resource.Body('flavor')
     #: Node network parameters.
     host_network = resource.Body('hostNetwork', type=HostNetworkSpec)
+    #: Enable Istio Support default: True
+    support_istio = resource.Body('supportIstio', type=bool)
     #: Cluster type.
     type = resource.Body('type')
-    #: Cluster version ['v1.9.2-r2', 'v1.11.3-r1'].
+    #: Cluster version ['v1.11.7-r2', 'v1.13.10-r0'].
     version = resource.Body('version')
 
 
diff --git a/otcextensions/tests/unit/sdk/cce/v3/test_cluster.py b/otcextensions/tests/unit/sdk/cce/v3/test_cluster.py
index 021745397..0672374be 100644
--- a/otcextensions/tests/unit/sdk/cce/v3/test_cluster.py
+++ b/otcextensions/tests/unit/sdk/cce/v3/test_cluster.py
@@ -39,7 +39,9 @@
             'spec': {
                 'type': 'VirtualMachine',
                 'flavor': 'cce.s1.small',
-                'version': 'v1.11.3-r1',
+                'version': 'v1.13.10-r0',
+                'az': 'eu-de-01',
+                'supportIstio': True,
                 'description': 'thisisademocluster',
                 'hostNetwork': {
                     'vpc': 'a8cc62dc-acc2-47d0-9bfb-3b1d776c520b',
@@ -50,7 +52,7 @@
                     'cidr': '172.16.0.0/16'
                 },
                 'authentication': {
-                    'mode': 'x509',
+                    'mode': 'rbac',
                     'authenticatingProxy': {}
                 },
                 'billingMode': 0