Changes to support DE virtual clusters (#37)

Signed-off-by: curtishoward <curtis@cloudera.com>

Author: curtishoward

src/cdpy/common.py

@@ -227,7 +227,8 @@ def _warning_format(message, category, filename, lineno, line=None):
             'ENV_STOPPED',
             'Stopped', # DW
             'NOT_ENABLED',  # DF
-            'ClusterDeletionCompleted' # DE
+            'ClusterDeletionCompleted', 'AppDeleted' # DE
+
         ]
 
         self.FAILED_STATES = [
@@ -242,7 +243,7 @@ def _warning_format(message, category, filename, lineno, line=None):
             'provision:failed',  # ML
             'deprovision:failed',  # ML
             'BAD_HEALTH',  # DF
-            # DE (all possibly intermediate failure states, until CDE exposes a higher-level summary state)
+            # DE service (all intermediate failure states, until CDE exposes a higher-level summary state)
             'ClusterChartInstallationFailed', 'ClusterDNSCreationFailed', 'ClusterDNSDeletionFailed',
             'ClusterIngressCreationFailed', 'ClusterProvisioningFailed', 'DBProvisioningFailed',
             'FSMountTargetsCreationFailed', 'FSProvisioningFailed', 'ClusterTLSCertCreationFailed',
@@ -252,7 +253,9 @@ def _warning_format(message, category, filename, lineno, line=None):
             'ClusterTLSCertDeletionFailed', 'ClusterServiceMeshDeletionFailed',
             'ClusterAccessGroupCreationFailed', 'ClusterAccessGroupDeletionFailed',
             'ClusterUserSyncCheckFailed', 'ClusterCreationFailed', 'ClusterDeleteFromDBFailed',
-            'ClusterMaintenanceFailed', 'ClusterTLSCertRenewalFailed'
+            'ClusterMaintenanceFailed', 'ClusterTLSCertRenewalFailed',
+             # DE virtual cluster
+             'AppInstallationFailed', 'AppDeletionFailed'
         ]
 
         self.REMOVABLE_STATES = [
@@ -261,7 +264,7 @@ def _warning_format(message, category, filename, lineno, line=None):
             'installation:failed', 'deprovision:failed', 'installation:finished', 'modify:finished',  # ML
             'Error', 'Running', 'Stopped', 'Deleting',  # DW
             'GOOD_HEALTH', 'CONCERNING_HEALTH', 'BAD_HEALTH',  # DF
-            'ClusterCreationCompleted' #DE
+            'ClusterCreationCompleted', 'AppInstalled' #DE
         ]
 
         # common regex patterns

src/cdpy/de.py

@@ -25,16 +25,18 @@ def list_vcs(self, cluster_id):
             clusterId=cluster_id
         )
 
-    def create_vc(self, name, cluster_id, cpu_requests, memory_requests,
-                  chart_value_overrides=None, runtime_spot_component=None):
+    def create_vc(self, name, cluster_id, cpu_requests, memory_requests, chart_value_overrides=None,
+                  runtime_spot_component=None, spark_version=None, acl_users=None):
         return self.sdk.call(
             svc='de', func='create_vc', ret_field='Vc',
             name=name,
             clusterId=cluster_id,
             cpuRequests=cpu_requests,
             memoryRequests=memory_requests,
             chartValueOverrides=chart_value_overrides,
-            runtimeSpotComponent=runtime_spot_component
+            runtimeSpotComponent=runtime_spot_component,
+            sparkVersion=spark_version,
+            aclUsers=acl_users
         )
 
     def delete_vc(self, cluster_id, vc_id):
@@ -95,3 +97,20 @@ def get_kubeconfig(self, cluster_id):
             svc='de', func='get_kubeconfig', ret_field='kubeconfig', squelch=[Squelch('NOT_FOUND')],
             clusterId=cluster_id
         )
+
+    def get_service_id_by_name(self, name, env):
+        cluster_id = None
+        for service in self.list_services(env, remove_deleted=True):
+            if service['name'] == name:
+                cluster_id = service['clusterId']
+                break
+        return cluster_id
+
+    def get_vc_id_by_name(self, name, cluster_id, remove_deleted=True):
+        vc_id = None
+        for vc in self.list_vcs(cluster_id):
+            vc_stopped = vc['status'] in self.sdk.STOPPED_STATES
+            if vc['vcName'] == name and (not vc_stopped if remove_deleted else True):
+                vc_id = vc['vcId']
+                break
+        return vc_id