knife-azure 1.6.0.rc.0 → 1.6.0

data/lib/azure/{certificate.rb → service_management/certificate.rb}

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-class Azure
+module Azure
   class Certificates
     def initialize(connection)
       @connection=connection
@@ -39,7 +39,7 @@ class Azure
   end
 end
 
-class Azure
+module Azure
   class Certificate
     attr_accessor :connection
     attr_accessor :cert_data, :fingerprint, :certificate_version

data/lib/azure/service_management/connection.rb

@@ -0,0 +1,102 @@
+#
+# Author:: Barry Davis (barryd@jetstreamsoftware.com)
+# Copyright:: Copyright (c) 2010-2011 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.
+#
+
+require 'azure/service_management/image'
+require 'azure/service_management/role'
+require 'azure/service_management/deploy'
+require 'azure/service_management/host'
+require 'azure/service_management/loadbalancer'
+require 'azure/service_management/vnet'
+require 'azure/service_management/utility'
+require 'azure/service_management/ag'
+require 'azure/service_management/storageaccount'
+require 'azure/service_management/certificate'
+require 'azure/service_management/disk'
+
+module Azure
+  class ServiceManagement
+    class Connection
+      include AzureUtility
+      attr_accessor :hosts, :rest, :images, :deploys, :roles,
+                    :disks, :storageaccounts, :certificates, :ags, :vnets, :lbs
+      def initialize(rest)
+        @images = Images.new(self)
+        @roles = Roles.new(self)
+        @deploys  = Deploys.new(self)
+        @hosts = Hosts.new(self)
+        @rest = rest
+        @lbs = Loadbalancer.new(self)
+        @vnets = Vnets.new(self)
+        @ags = AGs.new(self)
+        @storageaccounts = StorageAccounts.new(self)
+        @certificates = Certificates.new(self)
+        @disks = Disks.new(self)
+      end
+
+      def query_azure(service_name,
+                      verb = 'get',
+                      body = '',
+                      params = '',
+                      wait = true,
+                      services = true,
+                      content_type = nil)
+        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, services, content_type)
+        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.debug ret_val.to_xml
+            error_code, error_message = error_from_response_xml(ret_val)
+            Chef::Log.debug error_code + ' : ' + error_message if error_code.length > 0
+          else
+            Chef::Log.warn 'http error: ' + response.code
+          end
+        end
+        ret_val
+      end
+
+      def wait_for_completion()
+        status = 'InProgress'
+        Chef::Log.info 'Waiting while status returns InProgress'
+        while status == 'InProgress'
+          response = @rest.query_for_completion()
+          ret_val = Nokogiri::XML response.body
+          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
+            error_code, error_message = error_from_response_xml(ret_val)
+            Chef::Log.debug status + error_code + ' : ' + error_message if error_code.length > 0
+          end
+        end
+        ret_val
+      end
+    end
+  end
+end

data/lib/azure/{deploy.rb → service_management/deploy.rb}

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-class Azure
+module Azure
   class Deploys
     include AzureUtility
     def initialize(connection)
@@ -104,6 +104,7 @@ class Azure
       end
       @connection.roles.find_in_hosted_service(params[:azure_vm_name], params[:azure_dns_name])
     end
+
     def delete(rolename)
     end
 
@@ -130,9 +131,14 @@ class Azure
         @url = xml_content(deployXML, 'Deployment Url')
         @roles = Hash.new
         rolesXML = deployXML.css('Deployment RoleInstanceList RoleInstance')
-        rolesXML.each do |roleXML|
+        rolesListXML = deployXML.css('Deployment RoleList Role')
+        rolesXML.zip(rolesListXML).each do |roleXML,roleListXML|
           role = Role.new(@connection)
           role.parse(roleXML, hostedservicename, @name)
+          if role.publicipaddress.to_s.empty?
+            role.publicipaddress = xml_content(deployXML, 'VirtualIPs VirtualIP Address')
+          end
+          role.parse_role_list_xml(roleListXML)
           @roles[role.name] = role
         end
         @input_endpoints = Array.new

data/lib/azure/{disk.rb → service_management/disk.rb}

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-class Azure
+module Azure
   class Disks
     def initialize(connection)
       @connection=connection
@@ -51,7 +51,7 @@ class Azure
   end
 end
 
-class Azure
+module Azure
   class Disk
     attr_accessor :name, :attached
     def initialize(disk)

data/lib/azure/{host.rb → service_management/host.rb}

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-class Azure
+module Azure
   class Hosts
     include AzureUtility
     def initialize(connection)
@@ -94,7 +94,7 @@ class Azure
   end
 end
 
-class Azure
+module Azure
   class Host
     include AzureUtility
     attr_accessor :connection, :name, :url, :label

data/lib/azure/{image.rb → service_management/image.rb}

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-class Azure
+module Azure
   class Images
     def initialize(connection)
       @connection=connection
@@ -76,7 +76,7 @@ class Azure
   end
 end
 
-class Azure
+module Azure
   class Image
     attr_accessor :category, :label
     attr_accessor :name, :os, :eula, :description, :location

data/lib/azure/{loadbalancer.rb → service_management/loadbalancer.rb}

@@ -16,8 +16,10 @@
 # limitations under the License.
 #
 
-class Azure
-  class Loadbalancers
+module Azure
+  class Loadbalancer
+    include AzureUtility
+    attr_accessor :name, :service, :subnet, :vip
 
     def initialize(connection)
       @connection = connection
@@ -45,22 +47,6 @@ class Azure
       load[name]
     end
 
-    def create(params)
-      lb = Loadbalancer.new(@connection)
-      lb.create(params)
-    end
-  end
-end
-
-class Azure
-  class Loadbalancer
-    include AzureUtility
-    attr_accessor :name, :service, :subnet, :vip
-
-    def initialize(connection)
-      @connection = connection
-    end
-
     def parse(lbXML, hostedservicename)
       @name = xml_content(lbXML, 'Name')
       ip_configXML = lbXML.css('FrontendIpConfiguration')

data/lib/azure/{rest.rb → service_management/rest.rb}

@@ -33,32 +33,36 @@ module AzureAPI
                     verb = 'get',
                     body = '',
                     params = '',
-                    services = true)
+                    services = true,
+                    content_type = nil)
       svc_str = services ? '/services' : ''
-      request_url =
-        "https://#{@host_name}/#{@subscription_id}#{svc_str}/#{service_name}"
+      uri = URI.parse("#{@host_name}/#{@subscription_id}#{svc_str}/#{service_name}")
+      scheme = !uri.scheme ? "https://" : ""
+      request_url = "#{scheme}#{@host_name}/#{@subscription_id}#{svc_str}/#{service_name}"
       print '.'
-      response = http_query(request_url, verb, body, params)
+      response = http_query(request_url, verb, body, params, content_type)
       if response.code.to_i == 307
         Chef::Log.debug "Redirect to #{response['Location']}"
-        response = http_query(response['Location'], verb, body, params)
+        response = http_query(response['Location'], verb, body, params, content_type)
       end
       @last_request_id = response['x-ms-request-id']
       response
     end
 
-    def http_query(request_url, verb, body, params)
+    def http_query(request_url, verb, body, params, content_type = nil)
       uri = URI.parse(request_url)
       uri.query = params
       http = http_setup(uri)
-      request = request_setup(uri, verb, body)
+      request = request_setup(uri, verb, body, content_type)
       response = http.request(request)
       @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("#{@host_name}/#{@subscription_id}/operations/#{@last_request_id}")
+      scheme = !uri.scheme ? "https://" : ""
+      request_url = "#{scheme}#{@host_name}/#{@subscription_id}/operations/#{@last_request_id}"
       response = http_query(request_url, 'get', '', '')
       if response.code.to_i == 307
         Chef::Log.debug "Redirect to #{response['Location']}"
@@ -86,7 +90,7 @@ module AzureAPI
         http.key = OpenSSL::PKey::RSA.new(@pem_file)
       http
     end
-    def request_setup(uri, verb, body)
+    def request_setup(uri, verb, body, content_type)
       if verb == 'get'
         request = Net::HTTP::Get.new(uri.request_uri)
       elsif verb == 'post'
@@ -96,7 +100,7 @@ module AzureAPI
       elsif verb == 'put'
         request = Net::HTTP::Put.new(uri.request_uri)
       end
-      text = verb == 'put'
+      text = verb == 'put' && content_type.nil?
       request["x-ms-version"] = "2014-05-01"
       request["content-type"] = text ? "text/plain" : "application/xml"
       request["accept"] = "application/xml"
@@ -104,6 +108,7 @@ module AzureAPI
       request.body = body
       request
     end
+
     def showResponse(response)
       puts "=== response body ==="
       puts response.body

data/lib/azure/{role.rb → service_management/role.rb}

@@ -16,8 +16,9 @@
 # limitations under the License.
 #
 require 'securerandom'
+require 'azure/service_management/utility'
 
-class Azure
+module Azure
   class Roles
     include AzureUtility
     attr_accessor :connection, :roles
@@ -75,8 +76,8 @@ class Azure
       find(name) != nil
     end
 
-    def delete(name, params)
-      role = find(name)
+    def delete(params)
+      role = find(params[:name])
       if role != nil
         roleXML = nil
         roleXML = @connection.query_azure("hostedservices/#{role.hostedservicename}", "get", "", "embed-detail=true")
@@ -165,6 +166,12 @@ class Azure
       end
     end
 
+    def update(name, params)
+      role = Role.new(@connection)
+      roleExtensionXml = role.setup_extension(params)
+      role.update(name, params, roleExtensionXml)
+    end
+
     private :check_and_delete_role_and_resources, :check_and_delete_disks, :check_and_delete_service, :check_and_delete_storage
 
   end
@@ -175,6 +182,7 @@ class Azure
     attr_accessor :sshport, :hostedservicename, :deployname, :thumbprint
     attr_accessor :winrmport
     attr_accessor :hostname, :tcpports, :udpports
+    attr_accessor :role_xml, :os_type, :os_version
 
       TCP_ENDPOINTS_MAPPING = { '3389' => 'Remote Desktop',
                               '5986' => 'PowerShell',
@@ -233,6 +241,13 @@ class Azure
       end
     end
 
+    def parse_role_list_xml(roleListXML)
+      @role_xml = roleListXML
+      os_disk_xml = roleListXML.css('OSVirtualHardDisk')
+      @os_type = xml_content(os_disk_xml, 'OS')
+      @os_version = xml_content(os_disk_xml, 'SourceImageName')
+    end
+
     # Expects endpoint_param_string to be in the form {localport}:{publicport}:{lb_set_name}:{lb_probe_path}
     # Only localport is mandatory.
     def parse_endpoint_from_params(protocol, azure_vm_name, endpoint_param_string)
@@ -499,14 +514,14 @@ class Azure
                   if params[:chef_extension_public_param]
                     xml.ResourceExtensionParameterValue {
                       xml.Key "PublicParams"
-                      xml.Value params[:chef_extension_public_param]
+                      xml.Value Base64.encode64(params[:chef_extension_public_param].to_json)
                       xml.Type "Public"
                     }
                   end
                   if params[:chef_extension_private_param]
                     xml.ResourceExtensionParameterValue {
                       xml.Key "PrivateParams"
-                      xml.Value params[:chef_extension_private_param]
+                      xml.Value Base64.encode64(params[:chef_extension_private_param].to_json)
                       xml.Type "Private"
                     }
                   end
@@ -529,7 +544,7 @@ class Azure
             xml.OSVirtualHardDisk {
               disk_name = params[:azure_os_disk_name] || "disk_" + SecureRandom.uuid
               xml.DiskName disk_name
-              domain_suffix = params[:azure_api_host_name].scan(/core.*/)[0]
+              domain_suffix = params[:azure_api_host_name] ? params[:azure_api_host_name].scan(/core.*/)[0] : ''
               xml.MediaLink 'http://' + params[:azure_storage_account] + '.blob.' + domain_suffix + '/vhds/' + disk_name + '.vhd'
               xml.SourceImageName params[:azure_source_image]
             }
@@ -547,5 +562,158 @@ class Azure
       "/#{params['deploy_name']}/roles"
       @connection.query_azure(servicecall, "post", roleXML.to_xml)
     end
+
+    def setup_extension(params)
+      ## add Chef Extension config in role_xml retrieved from the server
+      puts "Adding Chef Extension config in server role..."
+      role_xml = update_role_xml_for_extension(params[:role_xml], params)
+
+      ## role_xml can't be used for update as it has additional tags like
+      ## role_name, osversion etc. which update API does not support, also the
+      ## xml is the child of parent node 'Deployment' in XML, so instead of
+      ## modifying the role_xml to fit for our requirements, we create
+      ## new XML (with Chef Extension config and other pre-existing VM config)
+      ## using the required values of the updated role_xml
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.PersistentVMRole(
+          'xmlns' => 'http://schemas.microsoft.com/windowsazure',
+          'xmlns:i' => 'http://www.w3.org/2001/XMLSchema-instance'
+        ) {
+            xml.ConfigurationSets role_xml.at_css('ConfigurationSets').children if !role_xml.at_css('ConfigurationSets').nil?
+            xml.ResourceExtensionReferences role_xml.at_css('ResourceExtensionReferences').children if !role_xml.at_css('ResourceExtensionReferences').nil?
+            xml.AvailabilitySetName role_xml.at_css('AvailabilitySetName').children if !role_xml.at_css('AvailabilitySetName').nil?
+            xml.DataVirtualHardDisks role_xml.at_css('DataVirtualHardDisks').children if !role_xml.at_css('DataVirtualHardDisks').nil?
+            xml.OSVirtualHardDisk role_xml.at_css('OSVirtualHardDisk').children if !role_xml.at_css('OSVirtualHardDisk').nil?
+            xml.RoleSize role_xml.at_css('RoleSize').children if !role_xml.at_css('RoleSize').nil?
+            xml.ProvisionGuestAgent role_xml.at_css('ProvisionGuestAgent').children if !role_xml.at_css('ProvisionGuestAgent').nil?
+        }
+      end
+
+      builder.doc.to_xml.gsub("&lt\;","<").gsub("&gt\;",">")
+    end
+
+    def update_role_xml_for_extension(roleXML, params)
+      ## check if 'ResourceExtensionReferences' node already exist in the XML,
+      ## if no add it, else retrieve the object of the existing node
+      add_resource_extension_references = roleXML.at_css('ResourceExtensionReferences').nil?
+
+      if add_resource_extension_references
+        resource_extension_references = Nokogiri::XML::Node.new('ResourceExtensionReferences', roleXML)
+      else
+        resource_extension_references = roleXML.css('ResourceExtensionReferences')
+      end
+
+      ## check if Azure Chef Extension is already installed on the given server,
+      ## if no than install it, else raise error saying that the extension is
+      ## already installed
+      ext = nil
+      if !add_resource_extension_references
+        if !resource_extension_references.at_css('ReferenceName').nil?
+          resource_extension_references.css('ReferenceName').each { |node| ext = node if node.content == params[:chef_extension] }
+        end
+      end
+
+      add_resource_extension_reference = ext.nil?
+
+      ## create Azure Chef Extension config and add it in the role_xml
+      if add_resource_extension_reference
+        resource_extension_reference = Nokogiri::XML::Node.new('ResourceExtensionReference', roleXML)
+
+        reference_name = Nokogiri::XML::Node.new('ReferenceName', roleXML)
+        reference_name.content = params[:chef_extension]
+        resource_extension_reference.add_child(reference_name)
+
+        publisher = Nokogiri::XML::Node.new('Publisher', roleXML)
+        publisher.content = params[:chef_extension_publisher]
+        resource_extension_reference.add_child(publisher)
+
+        name = Nokogiri::XML::Node.new('Name', roleXML)
+        name.content = params[:chef_extension]
+        resource_extension_reference.add_child(name)
+
+        version = Nokogiri::XML::Node.new('Version', roleXML)
+        version.content = params[:chef_extension_version]
+        resource_extension_reference.add_child(version)
+
+        resource_extension_parameter_values = Nokogiri::XML::Node.new('ResourceExtensionParameterValues', roleXML)
+        if params[:chef_extension_public_param]
+          resource_extension_parameter_value = Nokogiri::XML::Node.new('ResourceExtensionParameterValue', roleXML)
+
+          key = Nokogiri::XML::Node.new('Key', roleXML)
+          key.content = 'PublicParams'
+          resource_extension_parameter_value.add_child(key)
+
+          value = Nokogiri::XML::Node.new('Value', roleXML)
+          value.content = Base64.encode64(params[:chef_extension_public_param].to_json)
+          resource_extension_parameter_value.add_child(value)
+
+          type = Nokogiri::XML::Node.new('Type', roleXML)
+          type.content = 'Public'
+          resource_extension_parameter_value.add_child(type)
+
+          resource_extension_parameter_values.add_child(resource_extension_parameter_value)
+        end
+
+        if params[:chef_extension_private_param]
+          resource_extension_parameter_value = Nokogiri::XML::Node.new('ResourceExtensionParameterValue', roleXML)
+
+          key = Nokogiri::XML::Node.new('Key', roleXML)
+          key.content = 'PrivateParams'
+          resource_extension_parameter_value.add_child(key)
+
+          value = Nokogiri::XML::Node.new('Value', roleXML)
+          value.content = Base64.encode64(params[:chef_extension_private_param].to_json)
+          resource_extension_parameter_value.add_child(value)
+
+          type = Nokogiri::XML::Node.new('Type', roleXML)
+          type.content = 'Private'
+          resource_extension_parameter_value.add_child(type)
+
+          resource_extension_parameter_values.add_child(resource_extension_parameter_value)
+        end
+
+        resource_extension_reference.add_child(resource_extension_parameter_values)
+
+        state = Nokogiri::XML::Node.new('State', roleXML)
+        state.content = 'enable'
+        resource_extension_reference.add_child(state)
+
+        if add_resource_extension_references
+          resource_extension_references.add_child(resource_extension_reference)
+        else
+          resource_extension_references.last.add_child(resource_extension_reference)
+        end
+
+        roleXML.add_child(resource_extension_references) if add_resource_extension_references
+
+        add_provision_guest_agent = roleXML.at_css('ProvisionGuestAgent').nil?
+
+        if add_provision_guest_agent
+          provision_guest_agent = Nokogiri::XML::Node.new('ProvisionGuestAgent', roleXML)
+          provision_guest_agent.content = true
+        else
+          provision_guest_agent = roleXML.css('ProvisionGuestAgent')
+          provision_guest_agent.first.content = true
+        end
+
+        roleXML.add_child(provision_guest_agent) if add_provision_guest_agent
+      else ## raise error as Chef Extension is already installed on the server
+        raise "Chef Extension is already installed on the server #{params[:azure_vm_name]}."
+      end
+
+      roleXML
+    end
+
+    def update(name, params, roleXML)
+      puts "Updating server role..."
+      servicecall = "hostedservices/#{params[:azure_dns_name]}" +
+      "/deployments/#{params[:deploy_name]}/roles/#{name}"
+      ret_val = @connection.query_azure(servicecall, 'put', roleXML, '', true, true, 'application/xml')
+      error_code, error_message = error_from_response_xml(ret_val)
+      if error_code.length > 0
+        Chef::Log.debug(ret_val.to_s)
+        raise 'Unable to update role:' + error_code + ' : ' + error_message
+      end
+    end
   end
 end