azure 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184071aad7a3c42ae4096da3d27aaadf01f5dd42
-  data.tar.gz: 2b8f026ba119dda6324cbaeb1c0c0857dade93b8
+  metadata.gz: 04ded6fcb137549c13dbcb6a6a9edd6ef8984425
+  data.tar.gz: caa3fbe95aed896613b2e0fbf393fee2db4d49e7
 SHA512:
-  metadata.gz: d73a29abe2a26c39630977cce42d940cc1d15b9c12eeb87aeb8cf880427691e5952e85798ad47488b0ccd8f36c8f41648bc40febe0ea32506ba78b739cd47d68
-  data.tar.gz: ed70f72f78035c46141b33d56a7b1611fd610e8c1a2eab44c944c11d78c4062006e8b8915f425c007e48402b4bdfb78c77093c8bdf7dc30979c3916a6f85d9b4
+  metadata.gz: 6cd3141f9ecf5892a7537f5fc5d85a0495caf6ae135a1eca6bec1be900d638056e44dd40aef8c44bb858cbb916c8a7d63fa6a031e36c41ff2fea7dcbdab350d3
+  data.tar.gz: 0dea6a1183c5e1bb238351c6f9bcd0de7f6a4cf149d8ad3c8d7debb213430ebc73b538f9ef0d42f2950007a1005468eff39247ed2fc11f5533b60e3a6559e49b

data/ChangeLog.txt

@@ -1,3 +1,10 @@
+2014.05.06 - version 0.6.4
+* Upgraded Service Management Versioning to 2014-04-01
+* Created separate API for add role
+* Logical Unit Number(lun) is optional argument in API add_data_disk
+* Cloud service should delete only if there are no other VMs/Deployments in the cloud service
+* Added more sizes(Basic_A0, Basic_A1, Basic_A2, Basic_A3, Basic_A4) options for Virtual Machine and Cloud Service.
+
 2014.03.28 - version 0.6.3
 * Added get_cloud_service_properties method, which returns all cloud service properties (embed-detail=true), including info about all VMs
 * Added winrm_http_port and winrm_https_port to get_virtual_machine method to allow the users to configure custom ports for winrm-http and winrm-https

data/README.md

@@ -1,7 +1,8 @@
-# Windows Azure SDK for Ruby [![Build Status](https://travis-ci.org/WindowsAzure/azure-sdk-for-ruby.png?branch=dev)](https://travis-ci.org/WindowsAzure/azure-sdk-for-ruby)
+# Microsoft Azure SDK for Ruby
+[![Build Status](https://travis-ci.org/Azure/azure-sdk-for-ruby.png?branch=dev)](https://travis-ci.org/Azure/azure-sdk-for-ruby)
 
 
-This project provides a Ruby package that makes it easy to access and manage Windows Azure Services like Storage, Service Bus and Virtual Machines.
+This project provides a Ruby package that makes it easy to access and manage Microsoft Azure Services like Storage, Service Bus and Virtual Machines.
 
 # Library Features
 * Storage
@@ -25,23 +26,23 @@ This project provides a Ruby package that makes it easy to access and manage Win
         * create, list, and delete subscriptions
         * create, list, and delete rules
 * Base Management
-	* list locations
+  * list locations
     * get, list, create, update, delete affinity groups
 * Virtual Machine Management
     * list images
-	* list, delete Disks
+  * list, delete Disks
     * Virtual Machines
-		* create linux based VMs and ssh with cert and key option enabled for ssh and WINRM (both http & https)enabled for windows based VMs
-		* list, shut down, delete, find virtual machine deployments. While shutting down your VMs the provisioning state would be deallocated and this VM will not be included in the billing cycle.
-		* Create VM for a specific virtual network
+    * create linux based VMs and ssh with cert and key option enabled for ssh and WINRM (both http & https)enabled for windows based VMs
+    * list, shut down, delete, find virtual machine deployments. While shutting down your VMs the provisioning state would be deallocated and this VM will not be included in the billing cycle.
+    * Create VM for a specific virtual network
 * Cloud Service Management
     * create, list, delete cloud services
 * Storage Account Management
     * create, list storage accounts, list locations
 * SQL Database Server Management
-	* list, create SQL Database servers
-	* reset password for a SQL Database server
-	* list, set, delete firewall rules for a SQL Database server
+  * list, create SQL Database servers
+  * reset password for a SQL Database server
+  * list, set, delete firewall rules for a SQL Database server
 * Virtual Network Management
     * List VNet
     * Create VNet via parameters or xml file
@@ -68,7 +69,7 @@ gem install azure
 To get the source code of the SDK via **git** just type:
 
 ```bash
-git clone https://github.com/WindowsAzure/azure-sdk-for-ruby.git
+git clone https://github.com/Azure/azure-sdk-for-ruby.git
 cd ./azure-sdk-for-ruby
 ```
 Then, run bundler to install all the gem dependencies:
@@ -83,7 +84,7 @@ Running the command ``rdoc`` will generate the API documentation in the `./doc`
 
 ## Setup Connection
 
-You can use this SDK against the Windows Azure Services in the cloud, or against the local Storage Emulator if you are on Windows. Service Bus and Windows Azure Service Management emulation are not supported. Of course, to use the Windows Azure Services in the cloud, you need to first [create a Windows Azure account](http://www.windowsazure.com/en-us/pricing/free-trial/). After that, you can get the information you need to configure Storage and Service Bus from the [Windows Azure Portal](https://manage.windowsazure.com).
+You can use this SDK against the Microsoft Azure Services in the cloud, or against the local Storage Emulator if you are on Windows. Service Bus and Microsoft Azure Service Management emulation are not supported. Of course, to use the Microsoft Azure Services in the cloud, you need to first [create a Microsoft Azure account](http://www.windowsazure.com/en-us/pricing/free-trial/). After that, you can get the information you need to configure Storage and Service Bus from the [Microsoft Azure Portal](https://manage.windowsazure.com).
 
 There are two ways you can set up the connections:
 
@@ -91,7 +92,7 @@ There are two ways you can set up the connections:
 2. [via environment variables](#via-environment-variables)
 
 ### Via Code
-* Against Windows Azure Services in the cloud
+* Against Microsoft Azure Services in the cloud
 
   ```ruby
   require "azure"
@@ -130,7 +131,7 @@ There are two ways you can set up the connections:
   end
   ```
 ### Via Environment Variables
-* Against Windows Azure Services in the cloud
+* Against Microsoft Azure Services in the cloud
   * Storage
 
     ```bash
@@ -149,7 +150,7 @@ There are two ways you can set up the connections:
     ```bash
     AZURE_MANAGEMENT_CERTIFICATE = <path to *.pem or *.pfx>
     AZURE_SUBSCRIPTION_ID = <your subscription ID>
-    AZURE_MANAGEMENT_ENDPOINT = <The endpoint URL of Windows Azure management service>
+    AZURE_MANAGEMENT_ENDPOINT = <The endpoint URL of Microsoft Azure management service>
     AZURE_SQL_DATABASE_MANAGEMENT_ENDPOINT = <SQL Database Management Endpoint>
     AZURE_SQL_DATABASE_AUTHENTICATION_MODE = <:management_certificate or :sql_server>
     ```
@@ -171,7 +172,7 @@ You can use the following commands to run:
 * a specific suite of tests: ``rake test:integration:blob``
 * one particular test file: ``ruby -I"lib:test" "<path of the test file>"``
 # Usage
-**For more examples, please see the [Windows Azure Ruby Developer Center](http://www.windowsazure.com/en-us/develop/ruby)**
+**For more examples, please see the [Microsoft Azure Ruby Developer Center](http://www.windowsazure.com/en-us/develop/ruby)**
 ## Storage
 
 ### Blobs
@@ -373,13 +374,13 @@ virtual_machine_service.start_virtual_machine('vm_name', 'cloud_service_name')
 virtual_machine_service.restart_virtual_machine('vm_name', 'cloud_service_name')
 
 #API for add disk to Virtual Machine
-lun = 1  #Valid LUN values are 0 through 15.
 options = {
   :disk_label => 'disk-label',
   :disk_size => 100, #In GB
-  :import => false
+  :import => false,
+  :disk_name => 'Disk name' #Required when import is true
 }
-virtual_machine_service.add_data_disk('vm_name', 'cloud_service_name', lun, options)
+virtual_machine_service.add_data_disk('vm_name', 'cloud_service_name', options)
 
 #API to add/update Virtual Machine endpoints
 endpoint1 = {
@@ -421,19 +422,35 @@ options = {
   :private_key_file => 'c:/private_key.key', #required for ssh or winrm(https) certificate.
   :certificate_file => 'c:/certificate.pem', #required for ssh or winrm(https) certificate.
   :ssh_port => 2222,
-  :vm_size => 'Small', #valid choices are (ExtraSmall, Small, Medium, Large, ExtraLarge, A6, A7)
+  :vm_size => 'Small', #valid choices are (ExtraSmall Small Medium Large ExtraLarge A5 A6 A7 Basic_A0 Basic_A1 Basic_A2 Basic_A3 Basic_A4)
   :affinity_group_name => 'affinity1',
   :virtual_network_name => 'xplattestvnet',
   :subnet_name => 'subnet1',
   :availability_set_name => 'availabiltyset1'
 }
-virtual_machine_service.create_virtual_machine(params,options,add_role=false)
-# Here add_role is used as a flag to create multiple roles under the same cloud service. This parameter is false
-# by default. Atleast a single deployment should be created under a hosted service prior to setting this flag.
+virtual_machine_service.create_virtual_machine(params,options)
 
 #API usage to add new roles under cloud service creating VM 
-
-virtual_machine_service.create_virtual_machine(params,options,add_role=true)
+#API add_role create multiple roles under the same cloud service. Atleast a single deployment should be created under a hosted service.
+params = {
+  :vm_name => 'vm_name',
+  :cloud_service_name => 'cloud_service_name',
+  :vm_user => 'azureuser',
+  :image => 'a699494373c04fc0bc8f2bb1389d6106__Win2K8R2SP1-Datacenter-201305.01-en.us-127GB.vhd',
+  :password => 'ComplexPassword',
+}
+options = {
+  :storage_account_name => 'storage_suse',
+  :winrm_transport => ['https','http'], #Currently http is supported. To enable https, set the transport protocol to https, simply rdp to the VM once VM is in ready state, export the certificate ( CN name would be the deployment name) from the certstore of the VM and install to your local machine and communicate WinRM via https.
+  :tcp_endpoints => '80,3389:3390',
+  :private_key_file => 'c:/private_key.key', #required for ssh or winrm(https) certificate.
+  :certificate_file => 'c:/certificate.pem', #required for ssh or winrm(https) certificate.
+  :winrm_https_port => 5999,
+  :winrm_http_port => 6999, #Used to open different powershell port
+  :vm_size => 'Small', #valid choices are (ExtraSmall Small Medium Large ExtraLarge A5 A6 A7 Basic_A0 Basic_A1 Basic_A2 Basic_A3 Basic_A4)
+  :availability_set_name => 'availabiltyset'
+}
+virtual_machine_service.add_role(params, options)
 
 #Get a list of available virtual machine images
 virtual_machine_image_service = Azure::VirtualMachineImageManagementService.new
@@ -508,7 +525,7 @@ ip_range = {:start_ip_address => "0.0.0.1", :end_ip_address => "0.0.0.5"}
 sql_db_service.set_sql_server_firewall_rule("server-name", "rule-name", ip_range)
 
 # If ip_range was not specified in the above api then the IP of the machine from where the api is being called would be set as the rule.
-# To toggle between the option to allow windows azure services to access db server similar to azure portal just set the fire wall rule
+# To toggle between the option to allow Microsoft Azure services to access db server similar to azure portal just set the fire wall rule
 # with iprange to be 0.0.0.0 as start and end.Remove the rule to unset this option.
 ```
 ## Virtual Network Management
@@ -551,23 +568,23 @@ Currently the sdk supports *.pem or *.pfx (passwordless pfx) for service managem
 * To create pfx, simply download the publishsettings file for your subscription, copy the contents of Management Certificate from the publishsettings and save it in a file and name the file as your cert.pfx. This pfx will be a passwordless pfx which can be supplied as a cert parameter for Service Management Commands
 * Using the following openssl commands to extract the pem file and pass the pem file as management cert parameter.
     * To get only private key from pfx use Openssl.exe pkcs12 -in cert.pfx -nocerts -out cert.pem
-	* To remove passphrase from the above private key use ``Openssl.exe rsa -in cert.pem -out certprivnopassword.pem``
-	* To extract both public & private keys from pfx use ``Openssl.exe pkcs12 -in cert.pfx -out certprivpub.pem``
-	* To extract only public key from pem use ``Openssl.exe x509 -inform pem -in certprivpub.pem -pubkey -out certpub.pem -outform pem``
+  * To remove passphrase from the above private key use ``Openssl.exe rsa -in cert.pem -out certprivnopassword.pem``
+  * To extract both public & private keys from pfx use ``Openssl.exe pkcs12 -in cert.pfx -out certprivpub.pem``
+  * To extract only public key from pem use ``Openssl.exe x509 -inform pem -in certprivpub.pem -pubkey -out certpub.pem -outform pem``
 * Finally copy the public key & private key to a file *.pem and pass that pem file to management cert parameter.
 * To extract pem from custom certificate, export the pfx, follow the above steps to convert to pem and pass that pem file to management cert parameter.
 
 # Need Help?
 
-Be sure to check out the Windows Azure [Developer Forums on Stack Overflow and MSDN](http://go.microsoft.com/fwlink/?LinkId=234489) if you have trouble with the provided code.
+Be sure to check out the Microsoft Azure [Developer Forums on Stack Overflow and MSDN](http://go.microsoft.com/fwlink/?LinkId=234489) if you have trouble with the provided code.
 
 # Contribute Code or Provide Feedback
 
-If you would like to become an active contributor to this project please follow the instructions provided in [Windows Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
-If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/WindowsAzure/azure-sdk-for-ruby/issues) section of the project.
+If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
+If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-sdk-for-ruby/issues) section of the project.
 
 # Learn More
 
-For documentation on how to host Ruby applications on Windows Azure, please see the [Windows Azure Ruby Developer Center](http://www.windowsazure.com/en-us/develop/ruby/).
-For documentation on Azure PowerShell CLI tool for Windows, please see our readme [here](http://github.com/windowsazure/azure-sdk-tools).
-For documentation on the Azure cross platform CLI tool for Windows, Mac and Linux, please see our readme [here](http://github.com/windowsazure/azure-sdk-tools-xplat).
+For documentation on how to host Ruby applications on Microsoft Azure, please see the [Microsoft Azure Ruby Developer Center](http://www.windowsazure.com/en-us/develop/ruby/).
+For documentation on Azure PowerShell CLI tool for Windows, please see our readme [here](http://github.com/azure/azure-sdk-tools).
+For documentation on the Azure cross platform CLI tool for Windows, Mac and Linux, please see our readme [here](http://github.com/azure/azure-sdk-tools-xplat).

data/lib/azure/base_management/management_http_request.rb

@@ -35,7 +35,7 @@ module Azure
         @warn = false
         content_length = body ? body.bytesize.to_s : '0'
         @headers = {
-          'x-ms-version' => '2013-06-01',
+          'x-ms-version' => '2014-04-01',
           'Content-Type' => 'application/xml',
           'Content-Length' => content_length
         }

data/lib/azure/cloud_service_management/cloud_service.rb

@@ -16,7 +16,6 @@
 module Azure
   module CloudServiceManagement
     class CloudService
-
       def initialize
         yield self if block_given?
       end
@@ -33,6 +32,7 @@ module Azure
       attr_accessor :extended_properties
       attr_accessor :default_winrm_certificate_thumbprint
       attr_accessor :virtual_machines
+      attr_accessor :deployment_name
     end
   end
 end

data/lib/azure/cloud_service_management/cloud_service_management_service.rb

@@ -17,7 +17,6 @@ require 'azure/cloud_service_management/serialization'
 module Azure
   module CloudServiceManagement
     class CloudServiceManagementService < BaseManagementService
-
       def initialize
         super()
       end
@@ -48,12 +47,12 @@ module Azure
       #
       # Returns None
       def create_cloud_service(name, options = {})
-        Loggerx.error_with_exit "Cloud service name is not valid " unless name
+        Loggerx.error_with_exit 'Cloud service name is not valid ' unless name
         if get_cloud_service(name)
           Loggerx.warn "Cloud service #{name} already exists. Skipped..."
         else
           Loggerx.info "Creating cloud service #{name}."
-          request_path = "/services/hostedservices"
+          request_path = '/services/hostedservices'
           body = Serialization.cloud_services_to_xml(name, options)
           request = ManagementHttpRequest.new(:post, request_path, body)
           request.call
@@ -64,7 +63,7 @@ module Azure
       #
       # Returns an array of Azure::CloudServiceManagement::CloudService objects
       def list_cloud_services
-        request_path = "/services/hostedservices"
+        request_path = '/services/hostedservices'
         request = ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.cloud_services_from_xml(response)
@@ -95,7 +94,7 @@ module Azure
         request_path = "/services/hostedservices/#{name}?embed-detail=true"
         request = ManagementHttpRequest.new(:get, request_path)
         response = request.call
-        Serialization.cloud_services_from_xml(response)
+        Serialization.cloud_services_from_xml(response).first
       end
 
       # Public: Deletes the specified cloud service of given subscription id from Windows Azure.
@@ -106,7 +105,7 @@ module Azure
       #
       # Returns:  None
       def delete_cloud_service(cloud_service_name)
-        request_path= "/services/hostedservices/#{cloud_service_name}"
+        request_path = "/services/hostedservices/#{cloud_service_name}"
         request = ManagementHttpRequest.new(:delete, request_path)
         Loggerx.info "Deleting cloud service #{cloud_service_name}. \n"
         request.call
@@ -122,7 +121,7 @@ module Azure
       #
       # Returns NONE
       def delete_cloud_service_deployment(cloud_service_name)
-        request_path= "/services/hostedservices/#{cloud_service_name}/deploymentslots/production"
+        request_path = "/services/hostedservices/#{cloud_service_name}/deploymentslots/production"
         request = ManagementHttpRequest.new(:delete, request_path)
         Loggerx.info "Deleting deployment of cloud service \"#{cloud_service_name}\" ..."
         request.call
@@ -130,13 +129,12 @@ module Azure
 
       def upload_certificate(cloud_service_name, ssh)
         data = export_der(ssh[:cert], ssh[:key])
-        request_path= "/services/hostedservices/#{cloud_service_name}/certificates"
+        request_path = "/services/hostedservices/#{cloud_service_name}/certificates"
         body = Serialization.add_certificate_to_xml(data)
         Loggerx.info "Uploading certificate to cloud service #{cloud_service_name}..."
         request = ManagementHttpRequest.new(:post, request_path, body)
         request.call
       end
-
     end
   end
-end
+end

data/lib/azure/cloud_service_management/serialization.rb

@@ -66,8 +66,10 @@ module Azure
 
           cloud.label = Base64.decode64(xml_content(props_xml, 'Label'))
           cloud.description = xml_content(props_xml, 'Description')
-          cloud.location = xml_content(props_xml, 'Location')
-          cloud.affinity_group = xml_content(props_xml, 'AffinityGroup')
+          location = xml_content(props_xml, 'Location')
+          cloud.location = location unless location.empty?
+          affinity_group =  xml_content(props_xml, 'AffinityGroup')
+          cloud.affinity_group = affinity_group unless affinity_group
           cloud.status = xml_content(props_xml, 'Status')
           cloud.date_created = xml_content(props_xml, 'DateCreated')
           cloud.date_modified = xml_content(props_xml, 'DateLastModified')
@@ -82,7 +84,8 @@ module Azure
           cloud.default_winrm_certificate_thumbprint = xml_content(
             cloud_service_xml, 'DefaultWinRMCertificateThumbprint'
           )
-
+          deployment_xml = cloud_services_xml.css('Deployments Deployment')
+          cloud.deployment_name = xml_content(deployment_xml, 'Name')
           vms_in_deployment = {}
 
           cloud_service_xml.css('Deployments').each do |deployxml|
@@ -90,8 +93,7 @@ module Azure
             vms = Azure::VirtualMachineManagement::Serialization.virtual_machines_from_xml(
               deployxml, cloud.name
             )
-
-            vms_in_deployment[deployment_name.to_sym] = vms
+            vms_in_deployment[deployment_name.to_sym] = vms if vms
           end
 
           cloud.virtual_machines = vms_in_deployment
@@ -102,15 +104,14 @@ module Azure
 
       def self.add_certificate_to_xml(data)
         builder = Nokogiri::XML::Builder.new do |xml|
-          xml.CertificateFile('xmlns'=>'http://schemas.microsoft.com/windowsazure') {
+          xml.CertificateFile('xmlns' => 'http://schemas.microsoft.com/windowsazure') do
             xml.Data data
             xml.CertificateFormat 'pfx'
             xml.Password nil
-          }
+          end
         end
         builder.doc.to_xml
       end
-
     end
   end
 end

data/lib/azure/storage_management/storage_management_service.rb

@@ -55,13 +55,13 @@ module Azure
       end
 
       # Public: Gets the properties of the storage account specified.
-      # 
+      #
       # ==== Attributes
       #
       # * +name+  - String. The name of the storage account. Required.
       #
       # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460802.aspx
-      # 
+      #
       # Returns the storage account
       def get_storage_account_properties(name)
         request_path = "/services/storageservices/#{name}"

data/lib/azure/version.rb

@@ -17,7 +17,7 @@ module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 6 unless defined? MINOR
-    UPDATE = 3 unless defined? UPDATE
+    UPDATE = 4 unless defined? UPDATE
     PRE = nil unless defined? PRE
 
     class << self

data/lib/azure/virtual_machine_image_management/serialization.rb

@@ -18,9 +18,8 @@ require 'azure/virtual_machine_image_management/virtual_machine_disk'
 module Azure
   module VirtualMachineImageManagement
     module Serialization
-
       def self.virtual_machine_images_from_xml(imageXML)
-        os_images = Array.new
+        os_images = []
         virtual_machine_images = imageXML.css('Images OSImage')
         virtual_machine_images.each do |image_node|
           image = VirtualMachineImage.new
@@ -34,20 +33,19 @@ module Azure
       end
 
       def self.disks_from_xml(diskXML)
-        os_disks = Array.new
+        os_disks = []
         disks = diskXML.css('Disks Disk')
         disks.each do |disk_node|
           disk = VirtualMachineDisk.new
           disk.name = xml_content(disk_node, 'Name')
           disk.os_type = xml_content(disk_node, 'OS')
-          disk.attached = !xml_content(disk_node,'AttachedTo').empty?
+          disk.attached = !xml_content(disk_node, 'AttachedTo').empty?
           disk.image = xml_content(disk_node, 'SourceImageName')
           disk.size = xml_content(disk_node, 'LogicalDiskSizeInGB')
           os_disks << disk
         end
         os_disks
       end
-
     end
   end
-end
+end

data/lib/azure/virtual_machine_image_management/virtual_machine_disk.rb

@@ -15,13 +15,11 @@
 module Azure
   module VirtualMachineImageManagement
     class VirtualMachineDisk
-
       def initialize
         yield self if block_given?
       end
 
       attr_accessor :name, :attached, :os_type, :image, :size
-
     end
   end
 end

data/lib/azure/virtual_machine_image_management/virtual_machine_image.rb

@@ -15,13 +15,11 @@
 module Azure
   module VirtualMachineImageManagement
     class VirtualMachineImage
-
       def initialize
         yield self if block_given?
       end
 
       attr_accessor :os_type, :name, :category, :locations
-
     end
   end
 end