azure 0.6.0 → 0.6.1

data/lib/azure/base_management/location.rb

@@ -1,27 +1,27 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# 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/base_management/serialization"
-
-module Azure
-  module BaseManagement
-    class Location
-      attr_accessor :name, :available_services
-
-      def initialize
-        yield self if block_given?
-      end
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# 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/base_management/serialization"
+
+module Azure
+  module BaseManagement
+    class Location
+      attr_accessor :name, :available_services
+
+      def initialize
+        yield self if block_given?
+      end
+    end
+  end
+end

data/lib/azure/base_management/management_http_request.rb

@@ -1,149 +1,172 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# 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/core/http/http_response"
-require "azure/core/http/http_request"
-include Azure::Core::Http
-
-# Represents an HTTP request that can perform synchronous queries to
-# an HTTP server, returning a HttpResponse
-module Azure
-  module BaseManagement
-    class ManagementHttpRequest < HttpRequest
-
-      attr_accessor :uri,:warn,:key,:cert
-
-      # Public: Creates the ManagementHttpRequest
-      #
-      # method  - Symbol. The HTTP method to use (:get, :post, :put, :del, etc...)
-      # path    - URI. The URI of the HTTP endpoint to query
-      # body    - IO or String. The request body (optional)
-      # key     - String. The request key
-      # cert    - String. The request certificate
-      def initialize(method, path, body=nil)
-        super
-        @warn = false
-        content_length = body ? body.bytesize.to_s : "0"
-        @headers = {
-          "x-ms-version" => "2013-06-01",
-          "Content-Type"=> 'application/xml',
-          "Content-Length" => content_length
-        }
-        @uri = URI.parse(Azure.config.management_endpoint + Azure.config.subscription_id + path)
-        @key = Azure.config.http_private_key
-        @cert = Azure.config.http_certificate_key
-      end
-
-      # Public: Sends a request to HTTP server and returns a HttpResponse
-      #
-      # Returns a Nokogiri::XML instance of HttpResponse body
-      def call
-        request = http_request_class.new(uri.request_uri, headers)
-        request.body = body if body
-
-        http = nil
-        if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
-          if ENV['HTTP_PROXY']
-            proxy_uri = URI::parse(ENV['HTTP_PROXY'])
-          else
-            proxy_uri = URI::parse(ENV['HTTPS_PROXY'])
-          end
-
-          http = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port).new(uri.host, uri.port)
-        else
-          http = Net::HTTP.new(uri.host, uri.port)
-        end
-
-        if uri.scheme.downcase == 'https'
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.cert = cert
-          http.key = key
-        end
-        #http.set_debug_output($stdout)
-        response = HttpResponse.new(http.request(request))
-        response.uri = uri
-
-        wait_for_completion(response)
-        Nokogiri::XML response.body
-      end
-
-      # Public: Wait for HTTP request completion.
-      #
-      # ==== Attributes
-      #
-      # * +response+       - Azure::Core::Http::HttpResponse. HttpResponse Response
-      #
-      # Print Error or Success of HttpRequest
-      def wait_for_completion(response)
-        ret_val = Nokogiri::XML response.body
-        if ret_val.at_css('Error Code') && ret_val.at_css('Error Code').content == 'AuthenticationFailed'
-          Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
-        end
-        if (response.status_code.to_i == 200 or response.status_code.to_i == 201)
-          ret_val
-        elsif response.status_code.to_i > 201 && response.status_code.to_i <= 299
-          ret_val = check_completion(response.headers['x-ms-request-id'])
-        elsif warn && !response.success?
-          #Loggerx.warn ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
-        elsif response.body
-          if ret_val.at_css('Error Code') && ret_val.at_css('Error Message')
-            Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
-          else
-            Loggerx.exception_message "http error: #{response.status_code}"
-          end
-        else
-          Loggerx.exception_message "http error: #{response.status_code}"
-        end
-        ret_val
-      end
-
-      # Public: Gets the status of the specified operation and determines whether
-      # the operation has succeeded, failed, or is still in progress.
-      #
-      # ==== Attributes
-      #
-      # * +request_id+       - String.  x-ms-request-id response header of request
-      #
-      # See: http://msdn.microsoft.com/en-us/library/windowsazure/ee460783.aspx
-      #
-      # Print Error or Success of Operation.
-      def check_completion(request_id)
-        request_path= "/operations/#{request_id}"
-        done = false
-        while not done
-          print '# '
-          request= ManagementHttpRequest.new(:get, request_path)
-          response = request.call
-          status = xml_content(response, 'Operation Status')
-          status_code = xml_content(response, 'Operation HttpStatusCode')
-          done = status != 'InProgress'
-          if done
-            if status.downcase != "succeeded"
-              error_code = xml_content(response, 'Operation Error Code')
-              error_msg = xml_content(response, 'Operation Error Message')
-              Loggerx.exception_message "#{error_code}: #{error_msg}"
-            else
-              Loggerx.success " #{status.downcase} (#{status_code})"
-            end
-            puts ''
-          else
-            sleep(1)
-          end
-        end
-        response
-      end
-    end
-  end
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# 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/core/http/http_response'
+require 'azure/core/http/http_request'
+include Azure::Core::Http
+
+# Represents an HTTP request that can perform synchronous queries to
+# an HTTP server, returning a HttpResponse
+module Azure
+  module BaseManagement
+    class ManagementHttpRequest < HttpRequest
+      attr_accessor :uri, :warn, :key, :cert
+
+      # Public: Creates the ManagementHttpRequest
+      #
+      # method  - Symbol. The HTTP method to use (:get, :post, :put, :del, etc...)
+      # path    - URI. The URI of the HTTP endpoint to query
+      # body    - IO or String. The request body (optional)
+      # key     - String. The request key
+      # cert    - String. The request certificate
+      def initialize(method, path, body = nil)
+        super
+        @warn = false
+        content_length = body ? body.bytesize.to_s : '0'
+        @headers = {
+          'x-ms-version' => '2013-06-01',
+          'Content-Type' => 'application/xml',
+          'Content-Length' => content_length
+        }
+        @uri = URI.parse(Azure.config.management_endpoint + Azure.config.subscription_id + path)
+        @key = Azure.config.http_private_key
+        @cert = Azure.config.http_certificate_key
+      end
+
+      # Public: Sends a request to HTTP server and returns a HttpResponse
+      #
+      # Returns a Nokogiri::XML instance of HttpResponse body
+      def call
+        request = http_request_class.new(uri.request_uri, headers)
+        request.body = body if body
+        http = http_setup
+        # http.set_debug_output($stdout)
+        response = wait_for_completion(HttpResponse.new(http.request(request)))
+        Nokogiri::XML response.body unless response.nil?
+      end
+
+      # Public: Wait for HTTP request completion.
+      #
+      # ==== Attributes
+      #
+      # * +response+       - Azure::Core::Http::HttpResponse. HttpResponse Response
+      #
+      # Print Error or Success of HttpRequest
+      def wait_for_completion(response)
+        ret_val = Nokogiri::XML response.body
+        if ret_val.at_css('Error Code') && ret_val.at_css('Error Code').content == 'AuthenticationFailed'
+          Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+        end
+        if response.status_code.to_i == 200 || response.status_code.to_i == 201
+          return response
+        elsif redirected? response
+          rebuild_request response
+        elsif response.status_code.to_i > 201 && response.status_code.to_i <= 299
+          check_completion(response.headers['x-ms-request-id'])
+        elsif warn && !response.success?
+          # Loggerx.warn ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+        elsif response.body
+          if ret_val.at_css('Error Code') && ret_val.at_css('Error Message')
+            Loggerx.error_with_exit ret_val.at_css('Error Code').content + ' : ' + ret_val.at_css('Error Message').content
+          else
+            Loggerx.exception_message "http error: #{response.status_code}"
+          end
+        else
+          Loggerx.exception_message "http error: #{response.status_code}"
+        end
+      end
+
+      # Public: Gets the status of the specified operation and determines whether
+      # the operation has succeeded, failed, or is still in progress.
+      #
+      # ==== Attributes
+      #
+      # * +request_id+       - String.  x-ms-request-id response header of request
+      #
+      # See: http://msdn.microsoft.com/en-us/library/windowsazure/ee460783.aspx
+      #
+      # Print Error or Success of Operation.
+      def check_completion(request_id)
+        request_path = "/#{Azure.config.subscription_id}/operations/#{request_id}"
+        http = http_setup
+        headers['Content-Length'] = '0'
+        @method = :get
+        done = false
+        while not done
+          print '# '
+          request = http_request_class.new(request_path, headers)
+          response = HttpResponse.new(http.request(request))
+          ret_val = Nokogiri::XML response.body
+          status = xml_content(ret_val, 'Operation Status')
+          status_code = response.status_code.to_i
+          if status != 'InProgress'
+            done = true
+          end
+          if redirected? response
+            host_uri = URI.parse(response.headers['location'])
+            http = http_setup(host_uri)
+            done = false
+          end
+          if done
+            if status.downcase != 'succeeded'
+              error_code = xml_content(ret_val, 'Operation Error Code')
+              error_msg = xml_content(ret_val, 'Operation Error Message')
+              Loggerx.exception_message "#{error_code}: #{error_msg}"
+            else
+              Loggerx.success "#{status.downcase} (#{status_code})"
+            end
+            return
+          else
+            sleep(5)
+          end
+        end
+      end
+
+      def rebuild_request(response)
+        host_uri = URI.parse(response.headers['location'])
+        request = http_request_class.new(host_uri.request_uri, headers)
+        request.body = body if body
+        http = http_setup(host_uri)
+        wait_for_completion(HttpResponse.new(http.request(request)))
+      end
+
+      def redirected?(response)
+        (response.status_code.to_i == 307)
+      end
+
+      def http_setup(host_uri = nil)
+        @uri = host_uri if host_uri
+        http = nil
+        if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
+          if ENV['HTTP_PROXY']
+            proxy_uri = URI.parse(ENV['HTTP_PROXY'])
+          else
+            proxy_uri = URI.parse(ENV['HTTPS_PROXY'])
+          end
+          http = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port).new(uri.host, uri.port)
+        else
+          http = Net::HTTP.new(uri.host, uri.port)
+        end
+
+        if uri.scheme.downcase == 'https'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http.cert = cert
+          http.key = key
+        end
+        http
+      end
+    end
+  end
 end

data/lib/azure/base_management/serialization.rb

@@ -1,129 +1,129 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# 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.
-#--------------------------------------------------------------------------
-
-module Azure
-  module BaseManagement
-    module Serialization
-      def self.locations_from_xml(locationXML)
-        location_objs = []
-        xml = locationXML.css('Locations Location')
-        xml.each do |meta_node|
-          loc = Location.new
-          loc.name = xml_content(meta_node, 'Name')
-          available_services = meta_node.css('AvailableServices').children
-          loc.available_services = available_services.to_ary.join(', ')
-          location_objs << loc
-        end
-        location_objs
-      end
-
-      def self.affinity_group_to_xml(name, location, label, options = {})
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.CreateAffinityGroup(
-            'xmlns' => 'http://schemas.microsoft.com/windowsazure'
-          ) do
-            xml.Name name
-            xml.Label Base64.encode64(label).strip
-            xml.Description options[:description]
-            xml.Location location
-          end
-        end
-        builder.doc.to_xml
-      end
-
-      def self.affinity_groups_from_xml(affinity_xml)
-        affinity_groups = []
-        affinity_group_services_xml = affinity_xml.css(
-          'AffinityGroups  AffinityGroup'
-        )
-
-        affinity_group_services_xml.each do |ag_xml|
-          affinity_group = AffinityGroup.new
-          affinity_group.name = xml_content(ag_xml, 'Name')
-          affinity_group.label = Base64.decode64(xml_content(ag_xml, 'Label'))
-          affinity_group.description = xml_content(ag_xml, 'Description')
-          affinity_group.location = xml_content(ag_xml, 'Location')
-
-          capabilities = ag_xml.css('Capabilities Capability')
-          affinity_group.capability = capabilities.map { |x|  x.content }
-          affinity_groups << affinity_group
-        end
-        affinity_groups.compact
-      end
-
-      def self.affinity_group_from_xml(affinity_xml)
-        hosted_services_xml = affinity_xml.css(
-          'AffinityGroup HostedServices HostedService'
-        )
-
-        storage_services_xml = affinity_xml.css(
-          'AffinityGroup StorageServices StorageService'
-        )
-
-        capability_xml = affinity_xml.css(
-          'AffinityGroup Capabilities Capability'
-        )
-
-        AffinityGroup.new do |affinity_group|
-          affinity_group.name = xml_content(
-            affinity_xml,
-            'AffinityGroup Name'
-          )
-          affinity_group.label = Base64.decode64(
-            xml_content(
-              affinity_xml,
-              'AffinityGroup Label'
-            )
-          )
-          affinity_group.description = xml_content(
-            affinity_xml,
-            'AffinityGroup Description'
-          )
-          affinity_group.location = xml_content(
-            affinity_xml,
-            'AffinityGroup Location'
-          )
-          affinity_group.hosted_services = []
-          hosted_services_xml.each do |hosted_service_xml|
-            affinity_group.hosted_services << {
-              url: xml_content(hosted_service_xml, 'Url'),
-              service_name: xml_content(hosted_service_xml, 'ServiceName')
-            }
-          end
-          affinity_group.storage_services = []
-          storage_services_xml.each do |storage_service_xml|
-            affinity_group.storage_services << {
-              url: xml_content(storage_service_xml, 'Url'),
-              service_name: xml_content(storage_service_xml, 'ServiceName')
-            }
-          end
-          affinity_group.capability = capability_xml.map { |x| x.content }
-        end
-      end
-
-      def self.resource_to_xml(label, options = {})
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.UpdateAffinityGroup(
-            'xmlns' => 'http://schemas.microsoft.com/windowsazure'
-          ) do
-            xml.Label Base64.encode64(label).strip
-            xml.Description options[:description] if options[:description]
-          end
-        end
-        builder.doc.to_xml
-      end
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# 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.
+#--------------------------------------------------------------------------
+
+module Azure
+  module BaseManagement
+    module Serialization
+      def self.locations_from_xml(locationXML)
+        location_objs = []
+        xml = locationXML.css('Locations Location')
+        xml.each do |meta_node|
+          loc = Location.new
+          loc.name = xml_content(meta_node, 'Name')
+          available_services = meta_node.css('AvailableServices').children
+          loc.available_services = available_services.to_ary.join(', ')
+          location_objs << loc
+        end
+        location_objs
+      end
+
+      def self.affinity_group_to_xml(name, location, label, options = {})
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.CreateAffinityGroup(
+            'xmlns' => 'http://schemas.microsoft.com/windowsazure'
+          ) do
+            xml.Name name
+            xml.Label Base64.encode64(label).strip
+            xml.Description options[:description]
+            xml.Location location
+          end
+        end
+        builder.doc.to_xml
+      end
+
+      def self.affinity_groups_from_xml(affinity_xml)
+        affinity_groups = []
+        affinity_group_services_xml = affinity_xml.css(
+          'AffinityGroups  AffinityGroup'
+        )
+
+        affinity_group_services_xml.each do |ag_xml|
+          affinity_group = AffinityGroup.new
+          affinity_group.name = xml_content(ag_xml, 'Name')
+          affinity_group.label = Base64.decode64(xml_content(ag_xml, 'Label'))
+          affinity_group.description = xml_content(ag_xml, 'Description')
+          affinity_group.location = xml_content(ag_xml, 'Location')
+
+          capabilities = ag_xml.css('Capabilities Capability')
+          affinity_group.capability = capabilities.map { |x|  x.content }
+          affinity_groups << affinity_group
+        end
+        affinity_groups.compact
+      end
+
+      def self.affinity_group_from_xml(affinity_xml)
+        hosted_services_xml = affinity_xml.css(
+          'AffinityGroup HostedServices HostedService'
+        )
+
+        storage_services_xml = affinity_xml.css(
+          'AffinityGroup StorageServices StorageService'
+        )
+
+        capability_xml = affinity_xml.css(
+          'AffinityGroup Capabilities Capability'
+        )
+
+        AffinityGroup.new do |affinity_group|
+          affinity_group.name = xml_content(
+            affinity_xml,
+            'AffinityGroup Name'
+          )
+          affinity_group.label = Base64.decode64(
+            xml_content(
+              affinity_xml,
+              'AffinityGroup Label'
+            )
+          )
+          affinity_group.description = xml_content(
+            affinity_xml,
+            'AffinityGroup Description'
+          )
+          affinity_group.location = xml_content(
+            affinity_xml,
+            'AffinityGroup Location'
+          )
+          affinity_group.hosted_services = []
+          hosted_services_xml.each do |hosted_service_xml|
+            affinity_group.hosted_services << {
+              url: xml_content(hosted_service_xml, 'Url'),
+              service_name: xml_content(hosted_service_xml, 'ServiceName')
+            }
+          end
+          affinity_group.storage_services = []
+          storage_services_xml.each do |storage_service_xml|
+            affinity_group.storage_services << {
+              url: xml_content(storage_service_xml, 'Url'),
+              service_name: xml_content(storage_service_xml, 'ServiceName')
+            }
+          end
+          affinity_group.capability = capability_xml.map { |x| x.content }
+        end
+      end
+
+      def self.resource_to_xml(label, options = {})
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.UpdateAffinityGroup(
+            'xmlns' => 'http://schemas.microsoft.com/windowsazure'
+          ) do
+            xml.Label Base64.encode64(label).strip
+            xml.Description options[:description] if options[:description]
+          end
+        end
+        builder.doc.to_xml
+      end
+    end
+  end
+end