azure 0.6.0 → 0.6.1

data/lib/azure/cloud_service_management/cloud_service.rb

@@ -1,31 +1,38 @@
-#-------------------------------------------------------------------------
-# 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 CloudServiceManagement
-    class CloudService
-
-      def initialize
-        yield self if block_given?
-      end
-
-      attr_accessor :name
-      attr_accessor :description
-      attr_accessor :location
-      attr_accessor :affinity_group
-
-    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 CloudServiceManagement
+    class CloudService
+
+      def initialize
+        yield self if block_given?
+      end
+
+      attr_accessor :url
+      attr_accessor :name
+      attr_accessor :label
+      attr_accessor :description
+      attr_accessor :location
+      attr_accessor :affinity_group
+      attr_accessor :status
+      attr_accessor :date_created
+      attr_accessor :date_modified
+      attr_accessor :extended_properties
+      attr_accessor :default_winrm_certificate_thumbprint
+
+    end
+  end
+end

data/lib/azure/cloud_service_management/cloud_service_management_service.rb

@@ -1,126 +1,135 @@
-#-------------------------------------------------------------------------
-# 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/cloud_service_management/serialization'
-
-module Azure
-  module CloudServiceManagement
-    class CloudServiceManagementService < BaseManagementService
-
-      def initialize
-        super()
-      end
-
-      # Public: Creates a new cloud service in Windows Azure.
-      #
-      # ==== Attributes
-      #
-      # * +name+          - String. The name of the cloud service.
-      # * +options+       - Hash. Optional parameters.
-      #
-      # ==== Options
-      #
-      # Accepted key/value pairs in options parameter are:
-      # * +:location+            - String. The regional data center location where the cloud service will be created.(optional)
-      # * +:description+         - String. A description for the hosted service. (optional)
-      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg441304.aspx
-      #
-      # Returns None
-      def create_cloud_service(name, options={})
-        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"
-          body = Serialization.cloud_services_to_xml(name, options)
-          request = ManagementHttpRequest.new(:post, request_path, body)
-          request.call
-        end
-      end
-
-      # Public: Gets a list of hosted services available under the current subscription.
-      #
-      # Returns an array of Azure::CloudServiceManagement::CloudService objects
-      def list_cloud_services
-        request_path = "/services/hostedservices"
-        request = ManagementHttpRequest.new(:get, request_path, nil)
-        response = request.call
-        Serialization.cloud_services_from_xml(response)
-      end
-
-      # Public: Checks to see if the specified hosted service is available
-      #
-      # ==== Attributes
-      #
-      # * +name+       - String. Cloud service name.
-      #
-      # Returns: A boolean value indicating whether the cloud service exists.
-      # If true, the cloud service is available. If false, the cloud service
-      # does not exist.
-      def get_cloud_service(name)
-        return false if name.nil?
-        flag = false
-        list_cloud_services.each do |cloud_service|
-          if cloud_service.name == name
-            flag = true
-            break
-          end
-        end
-        flag
-      end
-
-      # Public: Deletes the specified cloud service of given subscription id from Windows Azure.
-      #
-      # ==== Attributes
-      #
-      # * +name+       - String. Cloud service name.
-      #
-      # Returns:  None
-      def delete_cloud_service(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
-      end
-
-      # Public: Deletes the specified deployment.
-      #
-      # ==== Attributes
-      #
-      # * +cloud_service_name+  - String. Cloud service name.
-      #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460815.aspx
-      #
-      # Returns NONE
-      def delete_cloud_service_deployment(cloud_service_name)
-        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
-      end
-
-      def upload_certificate(cloud_service_name, ssh)
-        data = export_der(ssh[:cert], ssh[:key])
-        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
+#-------------------------------------------------------------------------
+# 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/cloud_service_management/serialization'
+
+module Azure
+  module CloudServiceManagement
+    class CloudServiceManagementService < BaseManagementService
+
+      def initialize
+        super()
+      end
+
+      # Public: Creates a new cloud service in Windows Azure.
+      #
+      # ==== Attributes
+      #
+      # * +name+          - String. The name of the cloud service.
+      # * +options+       - Hash. Optional parameters.
+      #
+      # ==== Options
+      #
+      # Accepted key/value pairs in options parameter are:
+      # * +:label+  -String. The label for this cloud service.
+      # * +:description+         - String. A description for the hosted service. (optional)
+      # * +:location+  - String. The regional data center location where the
+      # cloud service will be created. Required if affinity group not
+      # specified (optional)
+      # * +:affinity_group_name  - String. Name of the affinity group with
+      # which to assocate the cloud service. Required if location not
+      # specified (optional)
+      # * +:extended_properties+  - Hash. Key/Value pairs of extended
+      # properties to add to the cloud service. The key is used as the
+      # property name and the value as its value. (optional)
+      #
+      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg441304.aspx
+      #
+      # Returns None
+      def create_cloud_service(name, options = {})
+        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"
+          body = Serialization.cloud_services_to_xml(name, options)
+          request = ManagementHttpRequest.new(:post, request_path, body)
+          request.call
+        end
+      end
+
+      # Public: Gets a list of hosted services available under the current subscription.
+      #
+      # Returns an array of Azure::CloudServiceManagement::CloudService objects
+      def list_cloud_services
+        request_path = "/services/hostedservices"
+        request = ManagementHttpRequest.new(:get, request_path, nil)
+        response = request.call
+        Serialization.cloud_services_from_xml(response)
+      end
+
+      # Public: Checks to see if the specified hosted service is available
+      #
+      # ==== Attributes
+      #
+      # * +name+       - String. Cloud service name.
+      #
+      # Returns: A boolean value indicating whether the cloud service exists.
+      # If true, the cloud service is available. If false, the cloud service
+      # does not exist.
+      def get_cloud_service(name)
+        return false if name.nil?
+        flag = false
+        list_cloud_services.each do |cloud_service|
+          if cloud_service.name == name
+            flag = true
+            break
+          end
+        end
+        flag
+      end
+
+      # Public: Deletes the specified cloud service of given subscription id from Windows Azure.
+      #
+      # ==== Attributes
+      #
+      # * +name+       - String. Cloud service name.
+      #
+      # Returns:  None
+      def delete_cloud_service(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
+      end
+
+      # Public: Deletes the specified deployment.
+      #
+      # ==== Attributes
+      #
+      # * +cloud_service_name+  - String. Cloud service name.
+      #
+      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460815.aspx
+      #
+      # Returns NONE
+      def delete_cloud_service_deployment(cloud_service_name)
+        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
+      end
+
+      def upload_certificate(cloud_service_name, ssh)
+        data = export_der(ssh[:cert], ssh[:key])
+        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

data/lib/azure/cloud_service_management/serialization.rb

@@ -1,63 +1,101 @@
-#-------------------------------------------------------------------------
-# 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 'base64'
-require 'azure/cloud_service_management/cloud_service'
-
-module Azure
-  module CloudServiceManagement
-    module Serialization
-
-      def self.cloud_services_to_xml(name, options={})
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.CreateHostedService('xmlns'=>'http://schemas.microsoft.com/windowsazure') {
-            xml.ServiceName name
-            xml.Label Base64.encode64(name)
-            xml.Description options[:description] || 'Explicitly created cloud service'  
-            if !options[:affinity_group_name].nil?
-              xml.AffinityGroup options[:affinity_group_name]
-            else
-              xml.Location options[:location]
-            end
-          }
-        end
-        builder.doc.to_xml
-      end
-      
-      def self.cloud_services_from_xml(cloudXML)
-        clouds = []
-        cloud_services_xml = cloudXML.css('HostedServices HostedService')
-        cloud_services_xml.each do |cloud_service_xml|
-          cloud = CloudService.new
-          cloud.name = xml_content(cloud_service_xml, 'ServiceName')
-          cloud.affinity_group = xml_content(cloud_service_xml, 'HostedServiceProperties AffinityGroup')
-          clouds << cloud
-        end
-        clouds.compact
-      end
-
-      def self.add_certificate_to_xml(data)
-        builder = Nokogiri::XML::Builder.new do |xml|
-          xml.CertificateFile('xmlns'=>'http://schemas.microsoft.com/windowsazure') {
-            xml.Data data
-            xml.CertificateFormat 'pfx'
-            xml.Password nil
-          }
-        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.
+#--------------------------------------------------------------------------
+require 'base64'
+require 'azure/cloud_service_management/cloud_service'
+
+module Azure
+  module CloudServiceManagement
+    module Serialization
+      def self.cloud_services_to_xml(name, options = {})
+        options[:label] = options[:label] || name
+
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.CreateHostedService(
+            'xmlns' => 'http://schemas.microsoft.com/windowsazure'
+          ) do
+            xml.ServiceName(name)
+            xml.Label(Base64.encode64(options[:label]))
+            xml.Description(options[:description]) unless\
+              options[:description].nil? || options[:description].empty?
+
+            unless options[:affinity_group_name].nil?
+              xml.AffinityGroup(options[:affinity_group_name])
+            else
+              xml.Location(options[:location])
+            end
+
+            xml.ExtendedProperties do
+              options[:extended_properties].each do |prop_name, prop_value|
+                xml.ExtendedProperty do
+                  xml.Name(prop_name)
+                  xml.Value(prop_value)
+                end unless (prop_name.nil? || prop_name.empty?)\
+                  || (prop_value.nil? || prop_value.empty?)
+              end
+            end unless options[:extended_properties].nil?\
+              || options[:extended_properties].empty?
+          end
+        end
+        builder.doc.to_xml
+      end
+
+      def self.cloud_services_from_xml(cloud_xml)
+        clouds = []
+        cloud_services_xml = cloud_xml.css('HostedServices HostedService')
+        cloud_services_xml.each do |cloud_service_xml|
+          cloud = CloudService.new
+          cloud.url = xml_content(cloud_service_xml, 'Url')
+          cloud.name = xml_content(cloud_service_xml, 'ServiceName')
+
+          props_xml = cloud_service_xml.css('HostedServiceProperties')
+
+          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')
+          cloud.status = xml_content(props_xml, 'Status')
+          cloud.date_created = xml_content(props_xml, 'DateCreated')
+          cloud.date_modified = xml_content(props_xml, 'DateLastModified')
+
+          cloud.extended_properties = {}
+          props_xml.css('ExtendedProperties ExtendedProperty').map do |prop|
+            p_name = xml_content(prop, 'Name')
+            p_value = xml_content(prop, 'Value')
+            cloud.extended_properties[p_name] = p_value
+          end
+
+          cloud.default_winrm_certificate_thumbprint = xml_content(
+            cloud_service_xml, 'DefaultWinRMCertificateThumbprint'
+          )
+
+          clouds << cloud
+        end
+        clouds.compact
+      end
+
+      def self.add_certificate_to_xml(data)
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.CertificateFile('xmlns'=>'http://schemas.microsoft.com/windowsazure') {
+            xml.Data data
+            xml.CertificateFormat 'pfx'
+            xml.Password nil
+          }
+        end
+        builder.doc.to_xml
+      end
+
+    end
+  end
+end