Commands/create vm

azure-cli.pyproj

@@ -126,6 +126,26 @@
     <Compile Include="command_modules\azure-cli-storage\setup.py" />
     <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\__init__.py" />
     <Compile Include="command_modules\azure-cli-taskhelp\setup.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\basic_dependency.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\dependency.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\deployment_extended.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\deployment_parameter_virtual_network_ip_address_prefix.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\deployment_properties_extended.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\deployment_vm.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\parameters_link.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\provider.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\provider_resource_type.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\template_link.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\vm_creation_client_enums.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\operations\vm_operations.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\vm_creation_client.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\__init__.py" />
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\command_specs.py">
       <SubType>Code</SubType>
     </Compile>
@@ -141,6 +161,9 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\__init__.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\__init__.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\__init__.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\__init__.py" />
     <Compile Include="command_modules\azure-cli-vm\setup.py" />
   </ItemGroup>
   <ItemGroup>
@@ -197,6 +220,11 @@
     <Folder Include="command_modules\azure-cli-vm\azure\cli\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\models\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\" />
     <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\recordings\" />
   </ItemGroup>
@@ -223,6 +251,20 @@
     <Content Include="command_modules\azure-cli-storage\requirements.txt" />
     <Content Include="command_modules\azure-cli-taskhelp\requirements.txt" />
     <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\tests\aliases.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\azuredeploy.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\ExistingStorageAccount.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\ExistingVNet.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\NewStorageAccount.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\NewVNet.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\nic_ip_existing_dns_none.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\nic_ip_new_dns_new.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\nic_ip_new_dns_none.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\nic_ip_none_dns_none.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\vm_existing_password.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\vm_existing_sshkey.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\vm_none_password.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\nested_templates\vm_none_sshkey.json" />
+    <Content Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\mgmt\swagger_create_vm.json" />
     <Content Include="command_modules\azure-cli-vm\requirements.txt" />
   </ItemGroup>
   <ItemGroup>

src/azure/cli/_help.py

@@ -86,13 +86,16 @@ def print_arguments(help_file):
                       indent,
                       max_name_length + indent*4 + 2)
 
-        indent = 2
+        indent = 4
         if p.long_summary:
             _print_indent('{0}'.format(p.long_summary.rstrip()), indent)
 
         if p.value_sources:
             _print_indent('')
             _print_indent(L("Values from: {0}").format(', '.join(p.value_sources)), indent)
+
+        if p.long_summary or p.value_sources:
+            print('')
     return indent
 
 def _print_header(help_file):
@@ -249,10 +252,17 @@ def update_from_data(self, data):
                                                  data.get('required'),
                                                  data.get('name')))
 
-        self.type = data.get('type')
-        self.short_summary = data.get('short-summary')
-        self.long_summary = data.get('long-summary')
-        self.value_sources = data.get('populator-commands')
+        if data.get('type'):
+            self.type = data.get('type')
+
+        if data.get('short-summary'):
+            self.short_summary = data.get('short-summary')
+
+        if data.get('long-summary'):
+            self.long_summary = data.get('long-summary')
+
+        if data.get('populator-commands'):
+            self.value_sources = data.get('populator-commands')
 
 
 class HelpExample(object): #pylint: disable=too-few-public-methods

src/azure/cli/_profile.py

@@ -192,7 +192,7 @@ def get_login_credentials(self):
                 username_or_sp_id)
 
         return BasicTokenAuthentication(
-            {'access_token': access_token}), active_account[_SUBSCRIPTION_ID]
+            {'access_token': access_token}), str(active_account[_SUBSCRIPTION_ID])
 
 
 class SubscriptionFinder(object):

src/azure/cli/tests/test_help.py

@@ -232,11 +232,13 @@ def test_handler(args):
 
 Arguments
     --foobar2 -fb2 [Required]: one line partial sentence
-        paragraph(s)
+                paragraph(s)
+
     --foobar -fb             : one line partial sentence
-        text, markdown, etc.
+                text, markdown, etc.
+
+                Values from: az vm list, default
 
-        Values from: az vm list, default
     --foobar3 -fb3           : the foobar3
     --help -h                : show this help message and exit
 '''
@@ -295,11 +297,13 @@ def test_handler(args):
 
 Arguments
     --foobar2 -fb2 [Required]: one line partial sentence
-        paragraph(s)
+                paragraph(s)
+
     --foobar -fb             : one line partial sentence
-        text, markdown, etc.
+                text, markdown, etc.
+
+                Values from: az vm list, default
 
-        Values from: az vm list, default
     --help -h                : show this help message and exit
 Examples
     foo example

src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/deployment_vnet.py

@@ -14,7 +14,7 @@ class DeploymentVNet(Model):
     Deployment operation parameters.
 
     :param str uri: URI referencing the template. Default value:
-     "https://azuretemplatehost.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
+     "https://azuresdkci.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
      .
     :param str content_version: If included it must match the ContentVersion
      in the template.
@@ -52,7 +52,7 @@ class DeploymentVNet(Model):
     }
 
     def __init__(self, content_version=None, deployment_parameter_virtual_network_prefix_value=None, deployment_parameter_subnet_prefix_value=None, deployment_parameter_virtual_network_name_value=None, deployment_parameter_subnet_name_value=None, deployment_parameter_location_value=None, **kwargs):
-        self.uri = "https://azuretemplatehost.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
+        self.uri = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
         self.content_version = content_version
         self.deployment_parameter_virtual_network_prefix_value = deployment_parameter_virtual_network_prefix_value
         self.deployment_parameter_subnet_prefix_value = deployment_parameter_subnet_prefix_value

src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/lib/models/template_link.py

@@ -14,7 +14,7 @@ class TemplateLink(Model):
     Entity representing the reference to the template.
 
     :param str uri: URI referencing the template. Default value:
-     "https://azuretemplatehost.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
+     "https://azuresdkci.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
      .
     :param str content_version: If included it must match the ContentVersion
      in the template.
@@ -30,5 +30,5 @@ class TemplateLink(Model):
     }
 
     def __init__(self, content_version=None, **kwargs):
-        self.uri = "https://azuretemplatehost.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
+        self.uri = "https://azuresdkci.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
         self.content_version = content_version

src/command_modules/azure-cli-network/azure/cli/command_modules/network/mgmt/swagger_create_vnet.json

@@ -148,7 +148,7 @@
           "type": "string",
           "description": "URI referencing the template.",
           "enum": [
-            "https://azuretemplatehost.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
+            "https://azuresdkci.blob.core.windows.net/templatehost/CreateVNet/azuredeploy.json"
           ]
         },
         "contentVersion": {

src/command_modules/azure-cli-storage/azure/cli/command_modules/storage/__init__.py

@@ -64,6 +64,8 @@ def _update_progress(current, total):
         message += '{: >5.1f}'.format(percent_done)
         print('\b' * len(message) + message, end='', file=stderr)
         stderr.flush()
+        if current == total:
+            print('', file=stderr)
 
 #### ACCOUNT COMMANDS #############################################################################
 

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/generated.py

@@ -1,3 +1,5 @@
+import argparse
+import re
 from azure.mgmt.compute import ComputeManagementClient, ComputeManagementClientConfiguration
 from azure.mgmt.compute.operations import (AvailabilitySetsOperations,
                                            VirtualMachineExtensionImagesOperations,
@@ -13,6 +15,11 @@
 from azure.cli.commands._auto_command import build_operation, AutoCommandDefinition
 from azure.cli.commands import CommandTable, LongRunningOperation
 from azure.cli._locale import L
+from azure.cli.command_modules.vm.mgmt.lib import (VMCreationClient as VMClient,
+                                                   VMCreationClientConfiguration
+                                                   as VMClientConfig)
+from azure.cli.command_modules.vm.mgmt.lib.operations import VMOperations
+from azure.cli._help_files import helps
 
 from ._params import PARAMETER_ALIASES
 from .custom import ConvenienceVmCommands
@@ -157,3 +164,101 @@ def _patch_aliases(alias_items):
                     AutoCommandDefinition(ConvenienceVmCommands.list_ip_addresses, 'object'),
                 ],
                 command_table, PARAMETER_ALIASES)
+
+vm_param_aliases = {
+    'name': {
+        'name': '--name -n'
+        },
+    'os_disk_uri': {
+        'name': '--os-disk-uri',
+        'help': argparse.SUPPRESS
+        },
+    'os_offer': {
+        'name': '--os_offer',
+        'help': argparse.SUPPRESS
+        },
+    'os_publisher': {
+        'name': '--os-publisher',
+        'help': argparse.SUPPRESS
+        },
+    'os_sku': {
+        'name': '--os-sku',
+        'help': argparse.SUPPRESS
+        },
+    'os_type': {
+        'name': '--os-type',
+        'help': argparse.SUPPRESS
+        },
+    'os_version': {
+        'name': '--os-version',
+        'help': argparse.SUPPRESS
+        },
+    }
+
+class VMImageFieldAction(argparse.Action): #pylint: disable=too-few-public-methods
+    def __call__(self, parser, namespace, values, option_string=None):
+        image = values
+        match = re.match('([^:]*):([^:]*):([^:]*):([^:]*)', image)
+
+        if image.lower().endswith('.vhd'):
+            namespace.os_disk_uri = image
+        elif match:
+            namespace.os_type = 'Custom'
+            namespace.os_publisher = match.group(1)
+            namespace.os_offer = match.group(2)
+            namespace.os_sku = match.group(3)
+            namespace.os_version = match.group(4)
+        else:
+            namespace.os_type = image
+
+extra_parameters = [
+    {
+        'name': '--image',
+        'help': 'The OS image.  Supported values: Common OS (e.g. Win2012R2Datacenter), URN (e.g. "publisher:offer:sku:version"), or existing VHD URI.',
+        'action': VMImageFieldAction
+        }
+    ]
+
+helps['vm create'] = """
+            type: command
+            short-summary: Create an Azure Virtual Machine
+            long-summary: See https://azure.microsoft.com/en-us/documentation/articles/virtual-machines-linux-quick-create-cli/ for an end-to-end tutorial
+            parameters: 
+                - name: --image
+                  type: string
+                  required: false
+                  short-summary: OS image
+                  long-summary: |
+                    Common OS types: CentOS, CoreOS, Debian, openSUSE, RHEL, SLES, UbuntuLTS,
+                    Win2012R2Datacenter, Win2012Datacenter, Win2008R2SP1
+                    Example URN: canonical:Ubuntu_Snappy_Core:15.04:2016.0318.1949
+                    Example URI: http://<storageAccount>.blob.core.windows.net/vhds/osdiskimage.vhd
+                  populator-commands: 
+                    - az vm image list
+                    - az vm image show
+            examples:
+                - name: Create a simple Windows Server VM with private IP address
+                  text: >
+                    az vm create --image Win2012R2Datacenter --admin-username myadmin --admin-password Admin_001 
+                    -l "West US" -g myvms --name myvm001
+                - name: Create a Linux VM with SSH key authentication, add a public DNS entry and add to an existing Virtual Network and Availability Set.
+                  text: >
+                    az vm create --image canonical:Ubuntu_Snappy_Core:15.04:2016.0318.1949
+                    --admin-username myadmin --admin-password Admin_001 --authentication-type sshkey
+                    --virtual-network-type existing --virtual-network-name myvnet --subnet-name default
+                    --availability-set-type existing --availability-set-id myavailset
+                    --public-ip-address-type new --dns-name-for-public-ip myGloballyUniqueVmDnsName
+                    -l "West US" -g myvms --name myvm18o --ssh-key-value "<ssh-rsa-key>"
+            """
+
+build_operation('vm',
+                'vm',
+                lambda _: get_mgmt_service_client(VMClient, VMClientConfig),
+                [
+                    AutoCommandDefinition(VMOperations.create_or_update,
+                                          LongRunningOperation(L('Creating virtual machine'), L('Virtual machine created')),
+                                          'create')
+                ],
+                command_table,
+                vm_param_aliases,
+                extra_parameters)

src/command_modules/azure-cli-vm/azure/cli/command_modules/vm/mgmt/__init__.py

@@ -0,0 +1,3 @@
+#pylint: skip-file 
+import pkg_resources
+pkg_resources.declare_namespace(__name__)