diff --git a/src/index.json b/src/index.json index c40a8b4f25f..adc86e0cf42 100644 --- a/src/index.json +++ b/src/index.json @@ -2126,54 +2126,6 @@ "sha256Digest": "797851bd8e6f734c39ff1cad498093264430262ab0f9a395541e00464119be6b" } ], - "spring-cloud": [ - { - "downloadUrl": "https://azurecliprod.blob.core.windows.net/cli-extensions/spring_cloud-0.1.0-py2.py3-none-any.whl", - "filename": "spring_cloud-0.1.0-py2.py3-none-any.whl", - "metadata": { - "azext.isPreview": true, - "azext.maxCliCoreVersion": "2.1.0", - "azext.minCliCoreVersion": "2.0.67", - "classifiers": [ - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "Intended Audience :: System Administrators", - "Programming Language :: Python", - "Programming Language :: Python :: 2", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "License :: OSI Approved :: MIT License" - ], - "extensions": { - "python.details": { - "contacts": [ - { - "email": "azpycli@microsoft.com", - "name": "Microsoft Corporation", - "role": "author" - } - ], - "document_names": { - "description": "DESCRIPTION.rst" - }, - "project_urls": { - "Home": "https://github.com/Azure/azure-cli-extensions" - } - } - }, - "generator": "bdist_wheel (0.30.0)", - "license": "MIT", - "metadata_version": "2.0", - "name": "spring-cloud", - "summary": "Microsoft Azure Command-Line Tools spring-cloud Extension", - "version": "0.1.0" - }, - "sha256Digest": "97234bd81e70d755ef882e6fb6c3619377d9342b3596071802b37f2c19602c97" - } - ], "storage-preview": [ { "downloadUrl": "https://azurecliprod.blob.core.windows.net/cli-extensions/storage_preview-0.2.9-py2.py3-none-any.whl", diff --git a/src/spring-cloud/azext_spring_cloud/_transformers.py b/src/spring-cloud/azext_spring_cloud/_transformers.py index 778be3a9dc1..ec40477ca4c 100644 --- a/src/spring-cloud/azext_spring_cloud/_transformers.py +++ b/src/spring-cloud/azext_spring_cloud/_transformers.py @@ -27,14 +27,14 @@ def transform_app_table_output(result): result = [result] for item in result: - item['State'] = item['properties']['provisioningState'] item['Production Deployment'] = item['properties']['activeDeploymentName'] item['Public Url'] = item['properties']['url'] - persistentStorage = item['properties']['persistentDisk'] - item['Persistent Storage'] = "{}/{} Gb".format( - persistentStorage['usedInGb'], persistentStorage['sizeInGb']) if persistentStorage['sizeInGb'] else "-" if 'activeDeployment' in item['properties']: + item['Status'] = item['properties']['activeDeployment']['properties']['status'] + item['Instance Count'] = item['properties']['activeDeployment']['properties']['deploymentSettings']['instanceCount'] + item['CPU'] = item['properties']['activeDeployment']['properties']['deploymentSettings']['cpu'] + item['Memory'] = item['properties']['activeDeployment']['properties']['deploymentSettings']['memoryInGb'] instances = item['properties']['activeDeployment']['properties']['instances'] if instances is None: instances = [] @@ -42,9 +42,10 @@ def transform_app_table_output(result): [x for x in instances if x['discoveryStatus'] == 'UP']) item['Discovery Status'] = "UP( {} ), DOWN( {} )".format( up_number, len(instances) - up_number) - item['Instance Count'] = item['properties']['activeDeployment']['properties']['deploymentSettings']['instanceCount'] - item['CPU'] = item['properties']['activeDeployment']['properties']['deploymentSettings']['cpu'] - item['Memory'] = item['properties']['activeDeployment']['properties']['deploymentSettings']['memoryInGb'] + + persistentStorage = item['properties']['persistentDisk'] + item['Persistent Storage'] = "{}/{} Gb".format( + persistentStorage['usedInGb'], persistentStorage['sizeInGb']) if persistentStorage['sizeInGb'] else "-" return result if is_list else result[0] @@ -57,15 +58,15 @@ def transform_spring_cloud_deployment_output(result): for item in result: item['App Name'] = item['properties']["appName"] - item['State'] = item['properties']['provisioningState'] + item['Status'] = item['properties']['status'] + item['Instance Count'] = item['properties']['deploymentSettings']['instanceCount'] + item['CPU'] = item['properties']['deploymentSettings']['cpu'] + item['Memory'] = item['properties']['deploymentSettings']['memoryInGb'] instances = item['properties']['instances'] if instances is None: instances = [] up_number = len([x for x in instances if x['discoveryStatus'] == 'UP']) item['Discovery Status'] = "UP( {} ), DOWN( {} )".format( up_number, len(instances) - up_number) - item['Instance Count'] = item['properties']['deploymentSettings']['instanceCount'] - item['CPU'] = item['properties']['deploymentSettings']['cpu'] - item['Memory'] = item['properties']['deploymentSettings']['memoryInGb'] return result if is_list else result[0]