Skip to content

Spring cloud change app table output #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zikalino merged 13 commits into from
Nov 4, 2019
Merged

Spring cloud change app table output #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d227770
use poller waiting for app create/update because sdk changed from syn…
peizhou298 Oct 31, 2019
bf5a8b4
remove spring-cloud in index.json
peizhou298 Oct 31, 2019
479d77f
make app update and deployment create parallel when creating app
peizhou298 Oct 31, 2019
52dbe5a
fix CI issues
peizhou298 Oct 31, 2019
5408710
fix null error in app table transformer
peizhou298 Oct 31, 2019
8db1663
use is None to judge null
peizhou298 Oct 31, 2019
c818b78
fix app table bugs
peizhou298 Oct 31, 2019
ea3b373
fix table show bugs
peizhou298 Oct 31, 2019
a74d1df
merge master
peizhou298 Oct 31, 2019
62ba6e3
change app table output state to deployment status
peizhou298 Nov 4, 2019
54b7e7d
Merge branch 'master' of https://github.com/Azure/azure-cli-extension…
peizhou298 Nov 4, 2019
cc35c75
remove spring in index.json for new release
peizhou298 Nov 4, 2019
0583bdd
Merge branch 'master' into peizhou/SpringCloudRebase
Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions src/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
23 changes: 12 additions & 11 deletions src/spring-cloud/azext_spring_cloud/_transformers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,25 @@ 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 = []
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']['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]

Expand All @@ -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]