knife-azure 1.1.4 → 1.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmY2MDlmMjMwZTA5OWVlOGRmODI2MzJmYjBmOWJkNmEzMjU1NWMzZQ==
+  data.tar.gz: !binary |-
+    ZGM5ZGRiOWNhYWYwZWE1MzEyYmQxNTk2OTZlNGQwM2QzMjA3OWU4NQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZTBmY2UxNTFlNTE0NDkwNWUzMTgzNDQ4YjBmNWI5OWUyMzAwNjVmYzRkZWRk
+    YjNiZTQ4OGRkZDQ4OThlMDc3ZWMzZDJhZTc1YjNlZmJhMWZjOTk5NzEyMmJj
+    NzhiZTUwYWE5Njg5YjQ2YjFhNWIyZWZjMWI1ZmIyMTUzMjczNzc=
+  data.tar.gz: !binary |-
+    ZjgzYTM4OGJiZTQ2MDVkN2FmY2E1YmEyZDk4ODA0M2ZkZGVmM2MzMzE3NTM5
+    YTQxMzQwYjc0MDdmYmQ5ZGZiZjc5NWNmMTQwMTMwYzFlYzQ0NTkzMDgyOTc1
+    NWZjMmU2YmM3Y2ViZGJkOWRiYWRlYmJiYTQ0MDM0NmE1YmI4MWM=

data/README.md

@@ -240,6 +240,43 @@ Outputs a list of all servers in the currently configured Azure account. PLEASE
 
     knife azure server list
 
+### Azure AG List Subcommand
+Outputs a list of defined affinity groups in the azure subscription.
+
+    knife azure ag list
+
+### Azure AG Create Subcommand
+Creates a new affinity group in the specified service location.
+
+    knife azure ag create -a 'mynewag' -m 'West US' --azure-ag-desc 'Optional Description'
+
+Knife options:
+
+    :azure_affinity_group       Specifies new affinity group name.
+    :azure_service_location     Specifies the geographic location.
+    :azure_ag_desc              Optional. Description for new affinity group.
+
+### Azure Vnet List Subcommand
+Outputs a list of defined virtual networks in the azure subscription.
+
+    knife azure vnet list
+
+### Azure Vnet Create Subcommand
+Creates a new or modifies an existing virtual network. If an existing virtual network is named, the
+affinity group and address space are replaced with the new values.
+
+    knife azure vnet create -n 'mynewvn' -a 'existingag' --azure_address_space '10.0.0.0/24'
+
+Knife options:
+
+    :azure_network_name         Specifies the name of the virtual network to create.
+    :azure_affinity_group       Specifies the affinity group to associate with the vnet.
+    :azure_address_space        Specifies the address space of the vnet using CIDR notation.
+
+For CIDR notation, see here: http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing
+Address available are defined in RFC 1918: http://en.wikipedia.org/wiki/Private_network
+
+
 ## Alternative Management Certificate Specification
 In addition to specifying the management certificate using the publishsettings
 file, you can also specify it in PEM format. Follow these steps to generate the certificate in the PEM format:

data/lib/azure/ag.rb

@@ -0,0 +1,97 @@
+#
+# Author:: Jeff Mendoza (jeffmendoza@live.com)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Azure
+  class AGs
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def load
+      @ags ||= begin
+        @ags = {}
+        response = @connection.query_azure('affinitygroups',
+                                           'get',
+                                           '',
+                                           '',
+                                           false)
+        response.css('AffinityGroup').each do |ag|
+          item = AG.new(@connection).parse(ag)
+          @ags[item.name] = item
+        end
+        @ags
+      end
+    end
+
+    def all
+      load.values
+    end
+
+    def exists?(name)
+      load.key?(name)
+    end
+
+    def find(name)
+      load[name]
+    end
+
+    def create(params)
+      ag = AG.new(@connection)
+      ag.create(params)
+    end
+  end
+end
+
+class Azure
+  class AG
+    attr_accessor :name, :label, :description, :location
+
+    def initialize(connection)
+      @connection = connection
+    end
+
+    def parse(image)
+      @name = image.at_css('Name').content
+      @label = image.at_css('Label').content
+      @description = image.at_css('Description').content if
+        image.at_css('Description')
+      @location = image.at_css('Location').content if image.at_css('Location')
+      self
+    end
+
+    def create(params)
+      builder = Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
+        xml.CreateAffinityGroup(
+          xmlns: 'http://schemas.microsoft.com/windowsazure'
+        ) do
+          xml.Name params[:azure_ag_name]
+          xml.Label Base64.strict_encode64(params[:azure_ag_name])
+          unless params[:azure_ag_desc].nil?
+            xml.Description params[:azure_ag_desc]
+          end
+          xml.Location params[:azure_location]
+        end
+      end
+      @connection.query_azure('affinitygroups',
+                              'post',
+                              builder.to_xml,
+                              '',
+                              false)
+    end
+  end
+end

data/lib/azure/connection.rb

@@ -24,11 +24,15 @@ require File.expand_path('../role', __FILE__)
 require File.expand_path('../disk', __FILE__)
 require File.expand_path('../image', __FILE__)
 require File.expand_path('../certificate', __FILE__)
+require File.expand_path('../ag', __FILE__)
+require File.expand_path('../vnet', __FILE__)
 
 class Azure
   class Connection
     include AzureAPI
-    attr_accessor :hosts, :rest, :images, :deploys, :roles, :disks, :storageaccounts, :certificates
+    include AzureUtility
+    attr_accessor :hosts, :rest, :images, :deploys, :roles,
+                  :disks, :storageaccounts, :certificates, :ags, :vnets
     def initialize(params={})
       @rest = Rest.new(params)
       @hosts = Hosts.new(self)
@@ -38,19 +42,32 @@ class Azure
       @roles = Roles.new(self)
       @disks = Disks.new(self)
       @certificates = Certificates.new(self)
+      @ags = AGs.new(self)
+      @vnets = Vnets.new(self)
     end
-    def query_azure(service_name, verb = 'get', body = '', params = '')
-      Chef::Log.info 'calling ' + verb + ' ' + service_name
+
+    def query_azure(service_name,
+                    verb = 'get',
+                    body = '',
+                    params = '',
+                    wait = true,
+                    services = true)
+      Chef::Log.info 'calling ' + verb + ' ' + service_name + (wait ? " synchronously" : " asynchronously")
       Chef::Log.debug body unless body == ''
-      response = @rest.query_azure(service_name, verb, body, params)
+      response = @rest.query_azure(service_name, verb, body, params, services)
       if response.code.to_i == 200
         ret_val = Nokogiri::XML response.body
+      elsif !wait && response.code.to_i == 202
+        Chef::Log.debug 'Request accepted in asynchronous mode'
+        ret_val = Nokogiri::XML response.body
       elsif response.code.to_i >= 201 && response.code.to_i <= 299
         ret_val = wait_for_completion()
       else
         if response.body
           ret_val = Nokogiri::XML response.body
-          Chef::Log.warn ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+          Chef::Log.debug ret_val.to_xml
+          error_code, error_message = error_from_response_xml(ret_val)
+          Chef::Log.warn error_code + ' : ' + error_message if error_code.length > 0
         else
           Chef::Log.warn 'http error: ' + response.code
         end
@@ -63,14 +80,15 @@ class Azure
       while status == 'InProgress'
         response = @rest.query_for_completion()       
         ret_val = Nokogiri::XML response.body
-        status = ret_val.at_css('Status').content
+        status = xml_content(ret_val,'Status')
         if status == 'InProgress'
           print '.'
           sleep(0.5)
         elsif status == 'Succeeded'
           Chef::Log.debug 'not InProgress : ' + ret_val.to_xml
         else
-          Chef::Log.warn status + ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+          error_code, error_message = error_from_response_xml(ret_val)
+          Chef::Log.warn status + error_code + ' : ' + error_message if error_code.length > 0
         end
       end
       ret_val

data/lib/azure/deploy.rb

@@ -18,6 +18,7 @@
 
 class Azure
   class Deploys
+    include AzureUtility
     def initialize(connection)
       @connection=connection
     end
@@ -65,8 +66,9 @@ class Azure
         end
       else
         ret_val = @connection.hosts.create(params)
-        if ret_val.css('Error Code').length > 0
-          Chef::Log.fatal 'Unable to create DNS:' + ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+        error_code, error_message = error_from_response_xml(ret_val)
+        if error_code.length > 0
+          Chef::Log.fatal 'Unable to create DNS:' + error_code + ' : ' + error_message
           exit 1
         end
       end
@@ -88,8 +90,10 @@ class Azure
         deployXML = deploy.setup(params)
         ret_val = deploy.create(params, deployXML)
       end
-      if ret_val.css('Error Code').length > 0
-        raise Chef::Log.fatal 'Unable to create role:' + ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+      error_code, error_message = error_from_response_xml(ret_val)
+      if error_code.length > 0
+        Chef::Log.debug(ret_val.to_s)
+        raise Chef::Log.fatal 'Unable to create role:' + error_code + ' : ' + error_message
       end
       @connection.roles.find_in_hosted_service(params[:azure_vm_name], params[:azure_dns_name])
     end

data/lib/azure/host.rb

@@ -18,6 +18,7 @@
 
 class Azure
   class Hosts
+    include AzureUtility
     def initialize(connection)
       @connection=connection
     end
@@ -53,8 +54,9 @@ class Azure
     # Look up on cloud and not local cache
     def exists_on_cloud?(name)
       ret_val = @connection.query_azure("hostedservices/#{name}")
-      if ret_val.nil? || ret_val.css('Error Code').length > 0
-        Chef::Log.warn 'Unable to find hosted(cloud) service:' + ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content if ret_val
+      error_code, error_message = error_from_response_xml(ret_val) if ret_val
+      if ret_val.nil? || error_code.length > 0
+        Chef::Log.warn('Unable to find hosted(cloud) service:' + error_code + ' : ' + error_message) if ret_val
         false
       else
         true
@@ -70,8 +72,9 @@ class Azure
     # Look up hosted service on cloud and not local cache
     def fetch_from_cloud(name)
       ret_val = @connection.query_azure("hostedservices/#{name}")
-      if ret_val.nil? || ret_val.css('Error Code').length > 0
-        Chef::Log.warn 'Unable to find hosted(cloud) service:' + ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content if ret_val
+      error_code, error_message = error_from_response_xml(ret_val) if ret_val
+      if ret_val.nil? || error_code.length > 0
+        Chef::Log.warn('Unable to find hosted(cloud) service:' + error_code + ' : ' + error_message) if ret_val
         nil
       else
         Host.new(@connection).parse(ret_val)

data/lib/azure/rest.rb

@@ -28,9 +28,26 @@ module AzureAPI
       @host_name = params[:azure_api_host_name]
       @verify_ssl = params[:verify_ssl_cert]
     end
-    def query_azure(service_name, verb = 'get', body = '', params = '')
-      request_url = "https://#{@host_name}/#{@subscription_id}/services/#{service_name}"
+
+    def query_azure(service_name,
+                    verb = 'get',
+                    body = '',
+                    params = '',
+                    services = true)
+      svc_str = services ? '/services' : ''
+      request_url =
+        "https://#{@host_name}/#{@subscription_id}#{svc_str}/#{service_name}"
       print '.'
+      response = http_query(request_url, verb, body, params)
+      if response.code.to_i == 307
+        Chef::Log.debug "Redirect to #{response['Location']}"
+        response = http_query(response['Location'], verb, body, params)
+      end
+      @last_request_id = response['x-ms-request-id']
+      response
+    end
+
+    def http_query(request_url, verb, body, params)
       uri = URI.parse(request_url)
       uri.query = params
       http = http_setup(uri)
@@ -39,13 +56,17 @@ module AzureAPI
       @last_request_id = response['x-ms-request-id']
       response
     end
+
     def query_for_completion()
       request_url = "https://#{@host_name}/#{@subscription_id}/operations/#{@last_request_id}"
-      uri = URI.parse(request_url)
-      http = http_setup(uri)
-      request = request_setup(uri, 'get', '')
-      response = http.request(request)
+      response = http_query(request_url, 'get', '', '')
+      if response.code.to_i == 307
+        Chef::Log.debug "Redirect to #{response['Location']}"
+        response = http_query(response['Location'], 'get', '', '')
+      end
+      response
     end
+
     def http_setup(uri)
       http = Net::HTTP.new(uri.host, uri.port)
       store = OpenSSL::X509::Store.new
@@ -72,9 +93,12 @@ module AzureAPI
         request = Net::HTTP::Post.new(uri.request_uri)
       elsif verb == 'delete'
         request = Net::HTTP::Delete.new(uri.request_uri)
+      elsif verb == 'put'
+        request = Net::HTTP::Put.new(uri.request_uri)
       end
-      request["x-ms-version"] = "2013-03-01"
-      request["content-type"] = "application/xml"
+      text = verb == 'put'
+      request["x-ms-version"] = "2013-08-01"
+      request["content-type"] = text ? "text/plain" : "application/xml"
       request["accept"] = "application/xml"
       request["accept-charset"] = "utf-8"
       request.body = body

data/lib/azure/role.rb

@@ -77,74 +77,95 @@ class Azure
     def delete(name, params)
       role = find(name)
       if role != nil
-        if alone_on_hostedservice(role)
-          servicecall = "hostedservices/#{role.hostedservicename}/deployments" +
-          "/#{role.deployname}"
-        else
-          servicecall = "hostedservices/#{role.hostedservicename}/deployments" +
-          "/#{role.deployname}/roles/#{role.name}"
-        end
-
         roleXML = nil
+        roleXML = @connection.query_azure("hostedservices/#{role.hostedservicename}", "get", "", "embed-detail=true")
+        osdisk = roleXML.css(roleXML, 'OSVirtualHardDisk')
+        disk_name = xml_content(osdisk, 'DiskName')
+        storage_account_name = xml_content(osdisk, 'MediaLink').gsub("http://", "").gsub(/.blob(.*)$/, "")
 
-        unless params[:preserve_azure_os_disk]
-            roleXML = @connection.query_azure(servicecall, "get")
+        if !params[:preserve_azure_os_disk] && !params[:preserve_azure_vhd] && !params[:wait]
+          # default compmedia = true. So, it deletes role and associated resources
+          check_and_delete_role_and_resources(params, role)
+        else
+          # compmedia = false. So, it deletes only role and not associated resources
+          check_and_delete_role_and_resources(params, role, compmedia=false)
+          check_and_delete_disks(params, disk_name)
+          check_and_delete_service(params)
         end
+        check_and_delete_storage(params, disk_name, storage_account_name)
+      end
+    end
 
-        @connection.query_azure(servicecall, "delete")
-        # delete role from local cache as well.
-        @connection.hosts.find(role.hostedservicename).delete_role(role)
-        @roles.delete(role) if @roles
-
-        unless params[:preserve_azure_dns_name]
-          unless params[:azure_dns_name].nil?
-            roles_using_same_service = find_roles_within_hostedservice(params[:azure_dns_name])
-            if roles_using_same_service.size <= 1
-              servicecall = "hostedservices/" + params[:azure_dns_name]
-              @connection.query_azure(servicecall, "delete")
-            end
-          end
+    def check_and_delete_role_and_resources(params, role, compmedia=true)
+      if alone_on_hostedservice(role)
+        if !params[:preserve_azure_dns_name] && compmedia
+          servicecall = "hostedservices/#{role.hostedservicename}"
+        else 
+          servicecall = "hostedservices/#{role.hostedservicename}/deployments/#{role.deployname}"
         end
+      else
+        servicecall = "hostedservices/#{role.hostedservicename}/deployments" +
+        "/#{role.deployname}/roles/#{role.name}"
+      end
+      if compmedia
+        @connection.query_azure(servicecall, "delete", "", "comp=media", wait=params[:wait])
+      else
+        @connection.query_azure(servicecall, "delete")
+      end
 
-        unless params[:preserve_azure_os_disk]
-          osdisk = roleXML.css(roleXML, 'OSVirtualHardDisk')
-          disk_name = xml_content(osdisk, 'DiskName')
-          servicecall = "disks/#{disk_name}"
-          storage_account = @connection.query_azure(servicecall, "get")
-
-          # OS Disk can only be deleted if it is detached from the VM.
-          # So Iteratively check for disk detachment from the VM while waiting for 5 minutes ,
-          # exit otherwise after 12 attempts.
-          for attempt in 0..12
-             break if @connection.query_azure(servicecall, "get").search("AttachedTo").text == ""
-             if attempt == 12 then puts "The associated disk could not be deleted due to time out." else sleep 25 end
-          end
-
-          unless params[:preserve_azure_vhd]
-           @connection.query_azure(servicecall, 'delete', '', 'comp=media')
-          else
-            @connection.query_azure(servicecall, 'delete')
-          end
-
-          if params[:delete_azure_storage_account]
-            storage_account_name = xml_content(storage_account, "MediaLink")
-            storage_account_name = storage_account_name.gsub("http://", "").gsub(/.blob(.*)$/, "")
+      # delete role from local cache as well.
+      @connection.hosts.find(role.hostedservicename).delete_role(role)
+      @roles.delete(role) if @roles
+    end
 
-            begin
-              @connection.query_azure("storageservices/#{storage_account_name}", "delete")
-            rescue Exception => ex
-              ui.warn("#{ex.message}")
-              ui.warn("#{ex.backtrace.join("\n")}")
-            end
+    def check_and_delete_disks(params, disk_name)
+      servicecall = "disks/#{disk_name}"
+      unless params[:preserve_azure_os_disk]
+        # OS Disk can only be deleted if it is detached from the VM.
+        # So Iteratively check for disk detachment from the VM while waiting for 5 minutes ,
+        # exit otherwise after 12 attempts.
+        for attempt in 0..12
+           break if @connection.query_azure(servicecall, "get").search("AttachedTo").text == ""
+           if attempt == 12 then puts "The associated disk could not be deleted due to time out." else sleep 25 end
+        end    
+        unless params[:preserve_azure_vhd]
+          @connection.query_azure(servicecall, 'delete', '', 'comp=media', wait=params[:wait])
+        else
+          @connection.query_azure(servicecall, 'delete')
+        end
+      end
+    end
 
+    def check_and_delete_service(params)
+      unless params[:preserve_azure_dns_name]
+        unless params[:azure_dns_name].nil?
+          roles_using_same_service = find_roles_within_hostedservice(params[:azure_dns_name])
+          if roles_using_same_service.size <= 1
+            servicecall = "hostedservices/" + params[:azure_dns_name]
+            @connection.query_azure(servicecall, "delete")        
           end
-
         end
+      end
+    end
 
-
+    def check_and_delete_storage(params, disk_name, storage_account_name)
+     if params[:delete_azure_storage_account]
+        # Iteratively check for disk deletion
+        for attempt in 0..12
+           break unless @connection.query_azure("disks").search("Name").text.include?(disk_name)
+           if attempt == 12 then puts "The associated disk could not be deleted due to time out." else sleep 25 end
+        end
+        begin
+          @connection.query_azure("storageservices/#{storage_account_name}", "delete")
+        rescue Exception => ex
+          ui.warn("#{ex.message}")
+          ui.warn("#{ex.backtrace.join("\n")}")
+        end
       end
     end
 
+    private :check_and_delete_role_and_resources, :check_and_delete_disks, :check_and_delete_service, :check_and_delete_storage
+
   end
 
   class Role
@@ -210,7 +231,7 @@ class Azure
                 xml.SSH {
                    xml.PublicKeys {
                      xml.PublicKey {
-                       xml.Fingerprint params[:fingerprint]
+                       xml.Fingerprint params[:fingerprint].to_s.upcase
                        xml.Path '/home/' + params[:ssh_user] + '/.ssh/authorized_keys'
                      }
                    }
@@ -228,6 +249,15 @@ class Azure
               xml.ResetPasswordOnFirstLogon 'false'
               xml.EnableAutomaticUpdates 'false'
               xml.AdminUsername params[:winrm_user]
+              if params[:bootstrap_proto].downcase == 'winrm'
+                xml.WinRM {
+                  xml.Listeners {
+                    xml.Listener {
+                      xml.Protocol 'Http'
+                    }
+                  }
+                }
+              end
               }
             end