From fa579377cea6af9b4924644471c185cb9f0b997e Mon Sep 17 00:00:00 2001 From: Ling Geng Date: Wed, 23 May 2018 14:28:22 -0700 Subject: [PATCH] Update Mesh CLI in doc --- .../application-deployment-quickstart.md | 10 +++++----- .../appmodel-scenarios-azurefiles-volume.md | 4 ++-- .../conceptual-docs/appmodel-scenarios-helloworld.md | 4 ++-- .../appmodel-scenarios-private-registry.md | 4 ++-- .../conceptual-docs/seabreeze-monitoring-overview.md | 8 ++++---- .../service-fabric-mesh-quickstart-deploy-core.md | 6 +++--- docs/reference-docs/cli/README.md | 8 ++++---- samples/src/quickstart/README.md | 12 ++++++------ 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/conceptual-docs/application-deployment-quickstart.md b/docs/conceptual-docs/application-deployment-quickstart.md index 985bbde..cf0063a 100644 --- a/docs/conceptual-docs/application-deployment-quickstart.md +++ b/docs/conceptual-docs/application-deployment-quickstart.md @@ -34,7 +34,7 @@ az group create --name --location eastus 3. Create your application using the following deployment command: ```cli -az sbz deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/quickstart/sbz_rp.linux.json +az mesh deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/quickstart/sbz_rp.linux.json ``` In a few seconds, your command should return with "provisioningState": "Succeeded" . Given below is the output from the command when using [Cloud Shell](https://docs.microsoft.com/en-us/azure/cloud-shell/overview). @@ -48,7 +48,7 @@ At this point, your application has been deployed. You can check to see its stat The application name for our quickstart application is SbzVoting, so let us fetch its details. ```cli -az sbz app show --resource-group --name SbzVoting +az mesh app show --resource-group --name SbzVoting ``` ## Go to the application @@ -58,7 +58,7 @@ Once the application status is returned as ""provisioningState": "Succeeded", we The network resource for our quickstart application is SbzVotingNetwork, so let us fetch its details. ```cli -az sbz network show --resource-group --name SbzVotingNetwork +az mesh network show --resource-group --name SbzVotingNetwork ``` The command should now return, with information like the screen shot below when running the command in [Cloud Shell](https://docs.microsoft.com/en-us/azure/cloud-shell/overview). From the output, copy the IP address . @@ -90,7 +90,7 @@ Let us now review the VotingWeb service. Its code package is in a container call You can use the "app list" command to get a list of applications you have deployed to your subscription. ```cli -az sbz app list -o table +az mesh app list -o table ``` ## Delete the resources @@ -111,7 +111,7 @@ For each codepackage (container) in your service instance, you can check its sta 1. Check the logs for each container instance in a CGS. In this example, we are going to fetch the logs from the container VotingWeb.Code, which is in the first replica of the service VotingWeb ```cli -az sbz codepackage logs --resource-group --application-name SbzVoting --service-name VotingWeb --replica-name 0 --name VotingWeb.Code +az mesh codepackage logs --resource-group --application-name SbzVoting --service-name VotingWeb --replica-name 0 --name VotingWeb.Code ``` diff --git a/docs/conceptual-docs/appmodel-scenarios-azurefiles-volume.md b/docs/conceptual-docs/appmodel-scenarios-azurefiles-volume.md index 3d4ad2b..42e5cb7 100644 --- a/docs/conceptual-docs/appmodel-scenarios-azurefiles-volume.md +++ b/docs/conceptual-docs/appmodel-scenarios-azurefiles-volume.md @@ -38,13 +38,13 @@ Create the application and related resources using one of the following commands For Linux: ```cli -az sbz deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/azurefiles-volume/sbz_rp.linux.json +az mesh deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/azurefiles-volume/sbz_rp.linux.json ``` For Windows: ```cli -az sbz deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/azurefiles-volume/sbz_rp.windows.json +az mesh deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/azurefiles-volume/sbz_rp.windows.json ``` Follow the prompts to enter the file share name, account name, and account key for the Azure File share that provides the volume. In a minute or so, your command should return with `"provisioningState": "Succeeded"`. diff --git a/docs/conceptual-docs/appmodel-scenarios-helloworld.md b/docs/conceptual-docs/appmodel-scenarios-helloworld.md index aa5d28a..5281eb4 100644 --- a/docs/conceptual-docs/appmodel-scenarios-helloworld.md +++ b/docs/conceptual-docs/appmodel-scenarios-helloworld.md @@ -36,7 +36,7 @@ az group create --name --location eastus Create the application and related resources using the following command. ```cli -az sbz deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/helloworld/sbz_rp.linux.json +az mesh deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/helloworld/sbz_rp.linux.json ``` In a minute or so, your command should return with `"provisioningState": "Succeeded"`. Once it does, get the public IP address by querying for the network resources created in this deployment. @@ -52,7 +52,7 @@ The network resource name for this example is `helloWorldNetwork`, fetch informa The network resource name for Windows example is `helloWorldNetworkWindows`. ```cli -az sbz network show --resource-group --name helloWorldNetwork +az mesh network show --resource-group --name helloWorldNetwork ``` Get the `publicIpAddress` property and connect to it using a browser. It should display a web page with a welcome message. diff --git a/docs/conceptual-docs/appmodel-scenarios-private-registry.md b/docs/conceptual-docs/appmodel-scenarios-private-registry.md index 0053d52..fff2341 100644 --- a/docs/conceptual-docs/appmodel-scenarios-private-registry.md +++ b/docs/conceptual-docs/appmodel-scenarios-private-registry.md @@ -44,7 +44,7 @@ Create the application and related resources using the following command and pro ```cli -az sbz deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/private-registry/sbz_rp.linux.json +az mesh deployment create --resource-group --template-uri https://seabreezequickstart.blob.core.windows.net/templates/private-registry/sbz_rp.linux.json ``` @@ -56,7 +56,7 @@ In a minute or so, your command should return with `"provisioningState": "Succee The network resource name for this example is `privateRegistryExampleNetwork`, fetch information about it using the following command. ```cli -az sbz network show --resource-group --name privateRegistryExampleNetwork +az mesh network show --resource-group --name privateRegistryExampleNetwork ``` Get the `publicIpAddress` property and connect to it using a browser. It should display a web page with a welcome message. diff --git a/docs/conceptual-docs/seabreeze-monitoring-overview.md b/docs/conceptual-docs/seabreeze-monitoring-overview.md index 87eb234..25099b4 100644 --- a/docs/conceptual-docs/seabreeze-monitoring-overview.md +++ b/docs/conceptual-docs/seabreeze-monitoring-overview.md @@ -13,7 +13,7 @@ This article discusses the monitoring and diagnostics options for the latest pre You can view your docker logs from your deployed containers, on a per container basis. In the SeaBreeze application model, each container is a code package in your application. To see the associated logs with a code package, use the following command: ```cli -az sbz codepackage logs --resource-group --app-name --service-name --replica-name --code-package-name +az mesh codepackage logs --resource-group --app-name --service-name --replica-name --code-package-name ``` *Note: currently, replica names are incrementing numbers from 0.* @@ -21,7 +21,7 @@ az sbz codepackage logs --resource-group --app-name --app-name SbzVoting --service-name VotingWeb --replica-name 0 --code-package-name VotingWeb.Code +az mesh codepackage logs --resource-group --app-name SbzVoting --service-name VotingWeb --replica-name 0 --code-package-name VotingWeb.Code ``` ## Platform events @@ -35,13 +35,13 @@ Here is a list of current events exposed in the platform, with a brief descripti Currently, events can be viewed at a servicereplica level. Here is the CLI command to view container events. ```cli -az sbz servicereplica show --app-name --service-name --replica-name +az mesh servicereplica show --app-name --service-name --replica-name ``` Here is what this looks like for seeing events for the VotingWeb service deployed in the [quickstart](application-deployment-quickstart.md): ```cli -az sbz servicereplica show --resource-group --app-name SbzVoting --service-name VotingWeb --replica-name 0 +az mesh servicereplica show --resource-group --app-name SbzVoting --service-name VotingWeb --replica-name 0 ``` ## Metrics diff --git a/docs/preview-docs/service-fabric-mesh-quickstart-deploy-core.md b/docs/preview-docs/service-fabric-mesh-quickstart-deploy-core.md index 061effc..051a817 100644 --- a/docs/preview-docs/service-fabric-mesh-quickstart-deploy-core.md +++ b/docs/preview-docs/service-fabric-mesh-quickstart-deploy-core.md @@ -62,16 +62,16 @@ code dockerfile docker build -t meshapp-tutorial . docker run -p 8181:80 meshapp-tutorial -az sbz deployment create --resource-group myResGroup --template-file C:\Users\adegeo\code\meshapp2\template.json --parameters `@template.params.json +az mesh deployment create --resource-group myResGroup --template-file C:\Users\adegeo\code\meshapp2\template.json --parameters `@template.params.json -az sbz network show --resource-group $rg --name helloWorldNetwork +az mesh network show --resource-group $rg --name helloWorldNetwork ## Clean up resources When you are ready to delete the application run the following command, you'll be prompted to confirm deletion enter `y` to confirm the command. ```azurecli-interactive -az sbz app delete -g $rg -n helloWorldApp +az mesh app delete -g $rg -n helloWorldApp ``` If you no longer need any of the resources you created in this quickstart, you can execute the [az group delete][az-group-delete] command to remove the resource group and all resources it contains. This command deletes the container deployed to service fabric mesh and all related resources. diff --git a/docs/reference-docs/cli/README.md b/docs/reference-docs/cli/README.md index 4dae915..5df2d04 100644 --- a/docs/reference-docs/cli/README.md +++ b/docs/reference-docs/cli/README.md @@ -488,13 +488,13 @@ Description: Create a deployment with a template file on the remote. - az sbz deployment create --resource-group mygroup --template-uri + az mesh deployment create --resource-group mygroup --template-uri https://seabreezequickstart.blob.core.windows.net/templates/qui ckstart/sbz_rp.linux.json Create a deployment with a template file on local disk. - az sbz deployment create --resource-group mygroup --template- + az mesh deployment create --resource-group mygroup --template- file ./appTemplate.json ### sbz network @@ -1212,13 +1212,13 @@ Description: Create a volume with a template file on a remote URL. - az sbz volume create --location westus --name myvolume + az mesh volume create --location westus --name myvolume --resource-group mygroup --template-uri https://mystorage.blob. core.windows.net/templates/volumeDescription.json Create a volume with a template file on local disk. - az sbz volume create --location westus --name myvolume + az mesh volume create --location westus --name myvolume --resource-group mygroup --template-file ./volumeDescription.json diff --git a/samples/src/quickstart/README.md b/samples/src/quickstart/README.md index 08d3173..7e44a55 100644 --- a/samples/src/quickstart/README.md +++ b/samples/src/quickstart/README.md @@ -23,22 +23,22 @@ To run the quick start do the following: 1. az group create --name SbzVotingRG --location eastus ### Create an application -1. az sbz app create --resource-group SbzVotingRG --template-uri https://seabreezequickstart.blob.core.windows.net/templates/helloworld/sbz_rp.linux.json +1. az mesh app create --resource-group SbzVotingRG --template-uri https://seabreezequickstart.blob.core.windows.net/templates/helloworld/sbz_rp.linux.json ### Check Status -1. az sbz app show --resource-group SbzVotingRG --name SbzVoting +1. az mesh app show --resource-group SbzVotingRG --name SbzVoting ### Get the public IP for the application -1. az sbz network show --resource-group SbzVotingRG --name SbzVotingNetwork | grep publicIP +1. az mesh network show --resource-group SbzVotingRG --name SbzVotingNetwork | grep publicIP ### Get the list of all SeaBreeze applications in the subscription in a table format -1. az sbz app list -o table +1. az mesh app list -o table ### Delete the application -1. az sbz app delete --resource-group SbzVotingRG --name SbzVoting +1. az mesh app delete --resource-group SbzVotingRG --name SbzVoting ### Delete the network -1. az sbz network delete --resource-group SbzVotingRG --name SbzVotingNetwork +1. az mesh network delete --resource-group SbzVotingRG --name SbzVotingNetwork ### Delete the resource group 1. az group delete --name SbzVotingRG --location eastus