merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/363b024a Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/363b024a Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/363b024a Branch: refs/heads/trunk Commit: 363b024a60441e62d678de5ace85713aa8486233 Parents: c674922 908aa5b Author: Anthony Shaw <[email protected]> Authored: Thu Sep 22 19:41:53 2016 +1000 Committer: Anthony Shaw <[email protected]> Committed: Thu Sep 22 19:41:53 2016 +1000 ---------------------------------------------------------------------- CHANGES.rst | 2 +- docs/compute/drivers/azure.rst | 14 +- docs/compute/drivers/azure_arm.rst | 54 + docs/examples/compute/azure_arm/instantiate.py | 7 + libcloud/common/azure_arm.py | 124 ++ libcloud/compute/drivers/azure_arm.py | 1281 ++++++++++++++++++ libcloud/compute/providers.py | 2 + libcloud/compute/types.py | 5 +- ...777_7777_7777_777777777777_oauth2_token.json | 1 + ...99999999999_providers_Microsoft_Compute.json | 200 +++ ...rosoft_Compute_locations_eastus_vmSizes.json | 28 + libcloud/test/compute/test_azure_arm.py | 69 + 12 files changed, 1782 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/363b024a/CHANGES.rst ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/363b024a/libcloud/compute/types.py ---------------------------------------------------------------------- diff --cc libcloud/compute/types.py index 740b688,9e96575..4fd25c5 --- a/libcloud/compute/types.py +++ b/libcloud/compute/types.py @@@ -59,111 -59,114 +59,114 @@@ class Provider(Type) """ Defines for each of the supported providers + Non-Dummy drivers are sorted in alphabetical order. Please preserve this + ordering when adding new drivers. + :cvar DUMMY: Example provider - :cvar EC2_US_EAST: Amazon AWS US N. Virgina - :cvar EC2_US_WEST: Amazon AWS US N. California - :cvar EC2_EU_WEST: Amazon AWS EU Ireland - :cvar RACKSPACE: Rackspace next-gen OpenStack based Cloud Servers - :cvar RACKSPACE_FIRST_GEN: Rackspace First Gen Cloud Servers + :cvar ABIQUO: Abiquo driver + :cvar ALIYUN_ECS: Aliyun ECS driver. + :cvar AURORACOMPUTE: Aurora Compute driver. - :cvar AZURE: Azure driver. ++ :cvar AZURE: Azure (classic) driver. ++ :cvar AZURE_ARM: Azure Resource Manager (modern) driver. + :cvar BLUEBOX: Bluebox + :cvar CLOUDSIGMA: CloudSigma + :cvar CLOUDSTACK: CloudStack + :cvar DIMENSIONDATA: Dimension Data Cloud + :cvar EC2: Amazon AWS. + :cvar ECP: Enomaly + :cvar ELASTICHOSTS: ElasticHosts.com + :cvar EXOSCALE: Exoscale driver. :cvar GCE: Google Compute Engine :cvar GOGRID: GoGrid - :cvar VPSNET: VPS.net - :cvar LINODE: Linode.com - :cvar VCLOUD: vmware vCloud - :cvar RIMUHOSTING: RimuHosting.com - :cvar ECP: Enomaly + :cvar GRIDSPOT: Gridspot driver :cvar IBM: IBM Developer Cloud - :cvar OPENNEBULA: OpenNebula.org - :cvar ELASTICHOSTS: ElasticHosts.com - :cvar CLOUDSIGMA: CloudSigma - :cvar NIMBUS: Nimbus - :cvar BLUEBOX: Bluebox - :cvar OPSOURCE: Opsource Cloud - :cvar DIMENSIONDATA: Dimension Data Cloud - :cvar NINEFOLD: Ninefold - :cvar TERREMARK: Terremark - :cvar EC2_US_WEST_OREGON: Amazon AWS US West 2 (Oregon) - :cvar CLOUDSTACK: CloudStack - :cvar CLOUDSIGMA_US: CloudSigma US Las Vegas - :cvar LIBVIRT: Libvirt driver + :cvar IKOULA: Ikoula driver. :cvar JOYENT: Joyent driver - :cvar VCL: VCL driver :cvar KTUCLOUD: kt ucloud driver - :cvar GRIDSPOT: Gridspot driver - :cvar ABIQUO: Abiquo driver + :cvar LIBVIRT: Libvirt driver + :cvar LINODE: Linode.com :cvar NEPHOSCALE: NephoScale driver - :cvar EXOSCALE: Exoscale driver. - :cvar IKOULA: Ikoula driver. - :cvar OUTSCALE_SAS: Outscale SAS driver. + :cvar NIMBUS: Nimbus + :cvar NINEFOLD: Ninefold + :cvar OPENNEBULA: OpenNebula.org + :cvar OPSOURCE: Opsource Cloud :cvar OUTSCALE_INC: Outscale INC driver. + :cvar OUTSCALE_SAS: Outscale SAS driver. :cvar PROFIT_BRICKS: ProfitBricks driver. + :cvar RACKSPACE: Rackspace next-gen OpenStack based Cloud Servers + :cvar RACKSPACE_FIRST_GEN: Rackspace First Gen Cloud Servers + :cvar RIMUHOSTING: RimuHosting.com + :cvar TERREMARK: Terremark + :cvar VCL: VCL driver + :cvar VCLOUD: vmware vCloud + :cvar VPSNET: VPS.net :cvar VULTR: vultr driver. - :cvar AZURE: Azure Service Manager (classic) driver. - :cvar AZURE_ARM: Azure Resource Manager (modern) driver. - :cvar AURORACOMPUTE: Aurora Compute driver. - :cvar ALIYUN_ECS: Aliyun ECS driver. """ + AZURE = 'azure' + AZURE_ARM = 'azure_arm' DUMMY = 'dummy' + ABIQUO = 'abiquo' + ALIYUN_ECS = 'aliyun_ecs' + AURORACOMPUTE = 'aurora_compute' + AZURE = 'azure' + BLUEBOX = 'bluebox' + BRIGHTBOX = 'brightbox' + BSNL = 'bsnl' + CISCOCCS = 'ciscoccs' + CLOUDFRAMES = 'cloudframes' + CLOUDSIGMA = 'cloudsigma' + CLOUDSTACK = 'cloudstack' + CLOUDWATT = 'cloudwatt' + DIGITAL_OCEAN = 'digitalocean' + DIMENSIONDATA = 'dimensiondata' EC2 = 'ec2' - RACKSPACE = 'rackspace' + ECP = 'ecp' + ELASTICHOSTS = 'elastichosts' + EUCALYPTUS = 'eucalyptus' + EXOSCALE = 'exoscale' + GANDI = 'gandi' GCE = 'gce' GOGRID = 'gogrid' - VPSNET = 'vpsnet' - LINODE = 'linode' - VCLOUD = 'vcloud' - RIMUHOSTING = 'rimuhosting' - VOXEL = 'voxel' - SOFTLAYER = 'softlayer' - EUCALYPTUS = 'eucalyptus' - ECP = 'ecp' + GRIDSPOT = 'gridspot' + HOSTVIRTUAL = 'hostvirtual' IBM = 'ibm' - OPENNEBULA = 'opennebula' - ELASTICHOSTS = 'elastichosts' - BRIGHTBOX = 'brightbox' - CLOUDSIGMA = 'cloudsigma' + IKOULA = 'ikoula' + INDOSAT = 'indosat' + INTERNETSOLUTIONS = 'internetsolutions' + JOYENT = 'joyent' + KTUCLOUD = 'ktucloud' + LIBVIRT = 'libvirt' + LINODE = 'linode' + MEDONE = 'medone' + NEPHOSCALE = 'nephoscale' NIMBUS = 'nimbus' - BLUEBOX = 'bluebox' - GANDI = 'gandi' - OPSOURCE = 'opsource' - DIMENSIONDATA = 'dimensiondata' + NINEFOLD = 'ninefold' + NTTA = 'ntta' + OPENNEBULA = 'opennebula' OPENSTACK = 'openstack' - SKALICLOUD = 'skalicloud' + OPSOURCE = 'opsource' + OUTSCALE_INC = 'outscale_inc' + OUTSCALE_SAS = 'outscale_sas' + PACKET = 'packet' + PROFIT_BRICKS = 'profitbricks' + RACKSPACE = 'rackspace' + RACKSPACE_FIRST_GEN = 'rackspace_first_gen' + RIMUHOSTING = 'rimuhosting' + RUNABOVE = 'runabove' SERVERLOVE = 'serverlove' - NINEFOLD = 'ninefold' + SKALICLOUD = 'skalicloud' + SOFTLAYER = 'softlayer' TERREMARK = 'terremark' - CLOUDSTACK = 'cloudstack' - LIBVIRT = 'libvirt' - JOYENT = 'joyent' VCL = 'vcl' - KTUCLOUD = 'ktucloud' - GRIDSPOT = 'gridspot' - RACKSPACE_FIRST_GEN = 'rackspace_first_gen' - HOSTVIRTUAL = 'hostvirtual' - ABIQUO = 'abiquo' - DIGITAL_OCEAN = 'digitalocean' - NEPHOSCALE = 'nephoscale' - CLOUDFRAMES = 'cloudframes' - EXOSCALE = 'exoscale' - IKOULA = 'ikoula' - OUTSCALE_SAS = 'outscale_sas' - OUTSCALE_INC = 'outscale_inc' + VCLOUD = 'vcloud' + VOXEL = 'voxel' + VPSNET = 'vpsnet' VSPHERE = 'vsphere' - PROFIT_BRICKS = 'profitbricks' VULTR = 'vultr' - AURORACOMPUTE = 'aurora_compute' - CLOUDWATT = 'cloudwatt' - PACKET = 'packet' - RUNABOVE = 'runabove' - INTERNETSOLUTIONS = 'internetsolutions' - INDOSAT = 'indosat' - BSNL = 'bsnl' - NTTA = 'ntta' - MEDONE = 'medone' - CISCOCCS = 'ciscoccs' - ALIYUN_ECS = 'aliyun_ecs' # OpenStack based providers - HPCLOUD = 'hpcloud' CLOUDWATT = 'cloudwatt' + HPCLOUD = 'hpcloud' KILI = 'kili' ONAPP = 'onapp'
