azure 0.6.0 → 0.6.1

data/test/unit/cloud_service_management/cloud_service_management_service_test.rb

@@ -1,94 +1,94 @@
-#-------------------------------------------------------------------------
-# 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 "test_helper"
-
-describe Azure::CloudServiceManagementService do
-
-  subject { Azure::CloudServiceManagementService.new }
-  let(:request_path) {'/services/hostedservices'}
-  let(:cloud_services_xml) { Fixtures["list_cloud_services"] }
-  let(:method) { :get }
-  let(:mock_request){ mock() }
-  let(:response) {
-    response = mock()
-    response.stubs(:body).returns(cloud_services_xml)
-    response
-  }
-  let(:response_body) { Nokogiri::XML response.body }
-
-  before{
-    Loggerx.expects(:puts).returns(nil).at_least(0)
-  }
-
-  describe "#list_cloud_services" do
-    before {
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
-      mock_request.expects(:call).returns(response_body)
-    }
-  
-    it "assembles a URI for the request" do
-      subject.list_cloud_services
-    end
-  
-    it "sets the properties of the CloudService instance" do
-      cloud_service = subject.list_cloud_services.first
-      cloud_service.name.must_equal 'cloud-service-1'
-    end
-  
-    it "returns a list of cloud services for the subscription" do
-      results = subject.list_cloud_services
-      results.must_be_kind_of Array
-      results.length.must_equal 2
-      results.first.must_be_kind_of Azure::CloudServiceManagement::CloudService
-    end
-  end
-  
-  describe "#get_cloud_service" do
-    before {
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
-      mock_request.expects(:call).returns(response_body)
-    }
-  
-    it "assembles a URI for the request" do
-      subject.get_cloud_service 'cloud-service-1'
-    end
-  
-    it "returns true if found cloud service with given name" do
-      result = subject.get_cloud_service 'cloud-service-1'
-      result.must_equal true
-    end
-  
-    it "returns false if cloud service with given name doesn't exists" do
-      result = subject.get_cloud_service 'cloud-service-3'
-      result.must_equal false
-    end
-  end
-
-  describe "#create_cloud_service" do
-  
-    it "Create cloud service return message if cloud service exists of given name." do
-      ManagementHttpRequest.any_instance.expects(:call).returns response_body
-      msg = subject.create_cloud_service 'cloud-service-1'
-      assert_match(/^Cloud service cloud-service-1 already exists*/, msg)
-    end
-
-    it "Create cloud service if cloud service doesn't exists of given name." do
-      Azure::CloudServiceManagementService.any_instance.stubs(:get_cloud_service).with('cloud-service-3').returns(false)
-      ManagementHttpRequest.any_instance.expects(:call).returns nil
-      subject.create_cloud_service 'cloud-service-3'
-    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 "test_helper"
+
+describe Azure::CloudServiceManagementService do
+
+  subject { Azure::CloudServiceManagementService.new }
+  let(:request_path) {'/services/hostedservices'}
+  let(:cloud_services_xml) { Fixtures["list_cloud_services"] }
+  let(:method) { :get }
+  let(:mock_request){ mock() }
+  let(:response) {
+    response = mock()
+    response.stubs(:body).returns(cloud_services_xml)
+    response
+  }
+  let(:response_body) { Nokogiri::XML response.body }
+
+  before{
+    Loggerx.expects(:puts).returns(nil).at_least(0)
+  }
+
+  describe "#list_cloud_services" do
+    before {
+      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
+      mock_request.expects(:call).returns(response_body)
+    }
+  
+    it "assembles a URI for the request" do
+      subject.list_cloud_services
+    end
+  
+    it "sets the properties of the CloudService instance" do
+      cloud_service = subject.list_cloud_services.first
+      cloud_service.name.must_equal 'cloud-service-1'
+    end
+  
+    it "returns a list of cloud services for the subscription" do
+      results = subject.list_cloud_services
+      results.must_be_kind_of Array
+      results.length.must_equal 2
+      results.first.must_be_kind_of Azure::CloudServiceManagement::CloudService
+    end
+  end
+  
+  describe "#get_cloud_service" do
+    before {
+      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
+      mock_request.expects(:call).returns(response_body)
+    }
+  
+    it "assembles a URI for the request" do
+      subject.get_cloud_service 'cloud-service-1'
+    end
+  
+    it "returns true if found cloud service with given name" do
+      result = subject.get_cloud_service 'cloud-service-1'
+      result.must_equal true
+    end
+  
+    it "returns false if cloud service with given name doesn't exists" do
+      result = subject.get_cloud_service 'cloud-service-3'
+      result.must_equal false
+    end
+  end
+
+  describe "#create_cloud_service" do
+  
+    it "Create cloud service return message if cloud service exists of given name." do
+      ManagementHttpRequest.any_instance.expects(:call).returns response_body
+      msg = subject.create_cloud_service 'cloud-service-1'
+      assert_match(/^Cloud service cloud-service-1 already exists*/, msg)
+    end
+
+    it "Create cloud service if cloud service doesn't exists of given name." do
+      Azure::CloudServiceManagementService.any_instance.stubs(:get_cloud_service).with('cloud-service-3').returns(false)
+      ManagementHttpRequest.any_instance.expects(:call).returns nil
+      subject.create_cloud_service 'cloud-service-3'
+    end
+
+  end
+end

data/test/unit/cloud_service_management/serialization_test.rb

@@ -1,76 +1,169 @@
-#-------------------------------------------------------------------------
-# 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 'test_helper'
-
-describe Azure::CloudServiceManagement::Serialization do
-  subject { Azure::CloudServiceManagement::Serialization }
-
-  let(:cloud_services_from_xml) { Fixtures['list_cloud_services'] }
-
-  describe '#cloud_services_from_xml' do
-
-    it 'accepts an XML string' do
-      subject.cloud_services_from_xml Nokogiri::XML(cloud_services_from_xml)
-    end
-
-    it 'returns an Array of CloudService instances' do
-      results = subject.cloud_services_from_xml(
-        Nokogiri::XML(cloud_services_from_xml)
-      )
-      results.must_be_kind_of Array
-      results[0].must_be_kind_of(Azure::CloudServiceManagement::CloudService)
-      results.count.must_equal 2
-    end
-  end
-
-  describe '#cloud_services_to_xml' do
-    let(:cloud_service_name) {'cloud-service'}
-
-    it 'accepts an name and options hash' do
-      subject.cloud_services_to_xml cloud_service_name
-    end
-
-    it 'serializes the argument to xml' do
-      results = subject.cloud_services_to_xml(
-        cloud_service_name, { location: 'West US' }
-      )
-      results.must_be_kind_of String
-      doc = Nokogiri::XML results
-      doc.css('ServiceName').text.must_equal cloud_service_name
-      doc.css('Location').text.must_equal 'West US'
-    end
-
-    it 'uses affinity_group if provided' do
-      results = subject.cloud_services_to_xml(
-        cloud_service_name,
-        { affinity_group_name: 'my-affinity-group', location: 'West US' }
-      )
-      results.must_be_kind_of String
-      doc = Nokogiri::XML results
-      doc.css('ServiceName').text.must_equal cloud_service_name
-      doc.css('AffinityGroup').text.must_equal 'my-affinity-group'
-    end
-
-    it 'serializes the options hash to xml' do
-      results = subject.cloud_services_to_xml(
-        cloud_service_name,
-        { location: 'East US' }
-      )
-      doc = Nokogiri::XML results
-      doc.css('Location').text.must_equal 'East US'
-      results.must_be_kind_of String
-    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 'test_helper'
+
+describe Azure::CloudServiceManagement::Serialization do
+  subject { Azure::CloudServiceManagement::Serialization }
+
+  let(:cloud_services_from_xml) { Fixtures['list_cloud_services'] }
+
+  describe '#cloud_services_from_xml' do
+    let (:cloud_services_xml) { Nokogiri::XML(cloud_services_from_xml) }
+    it 'accepts an XML string' do
+      subject.cloud_services_from_xml Nokogiri::XML(cloud_services_from_xml)
+    end
+
+    it 'returns an Array of CloudService instances' do
+      results = subject.cloud_services_from_xml(cloud_services_xml)
+      results.must_be_kind_of Array
+      results[0].must_be_kind_of(Azure::CloudServiceManagement::CloudService)
+      results.count.must_equal 2
+    end
+
+    it 'populates all properties for a cloud service' do
+      results = subject.cloud_services_from_xml(cloud_services_xml)
+      cloud = results.first
+      cloud_xml = cloud_services_xml.css('HostedServices HostedService').first
+      cloud.url.must_equal(cloud_xml.css('Url').text)
+      cloud.name.must_equal(cloud_xml.css('ServiceName').text)
+      cloud.description.must_equal(cloud_xml.css('Description').text)
+      cloud.location.must_equal(cloud_xml.css('Location').text)
+      cloud.label.must_equal(Base64.decode64(cloud_xml.css('Label').text))
+      cloud.status.must_equal(cloud_xml.css('Status').text)
+      cloud.date_created.must_equal(cloud_xml.css('DateCreated').text)
+      cloud.date_modified.must_equal(cloud_xml.css('DateLastModified').text)
+      cloud.extended_properties.size.must_equal(
+        cloud_xml.css('ExtendedProperties ExtendedProperty').size
+      )
+      cloud_xml.css('ExtendedProperties ExtendedProperty').each do |p|
+        cloud.extended_properties[p.css('Name').text].must_equal(
+          p.css('Value').text
+        )
+      end
+      cloud.default_winrm_certificate_thumbprint.must_equal(
+        cloud_xml.css('DefaultWinRMCertificateThumbprint').text
+      )
+    end
+  end
+
+  describe '#cloud_services_to_xml' do
+    let(:cloud_service_name) {'cloud-service'}
+
+    it 'accepts an name and options hash' do
+      subject.cloud_services_to_xml cloud_service_name
+    end
+
+    it 'uses name for label if label not provided' do
+      results = subject.cloud_services_to_xml(
+        cloud_service_name,
+        {
+          location: 'East Asia'
+        }
+      )
+
+      doc = Nokogiri::XML(results)
+      Base64.decode64(doc.css('Label').text).must_equal(cloud_service_name)
+    end
+
+    it 'uses label when label is provided' do
+      results = subject.cloud_services_to_xml(
+        cloud_service_name,
+        {
+          location: 'East Asia',
+          label: 'My Label'
+        }
+      )
+
+      doc = Nokogiri::XML(results)
+      Base64.decode64(doc.css('Label').text).must_equal('My Label')
+    end
+
+    it 'serializes the argument to xml' do
+      results = subject.cloud_services_to_xml(
+        cloud_service_name, { location: 'West US' }
+      )
+      results.must_be_kind_of String
+      doc = Nokogiri::XML results
+      doc.css('ServiceName').text.must_equal cloud_service_name
+      doc.css('Location').text.must_equal 'West US'
+    end
+
+    it 'uses affinity_group if provided and ignores location' do
+      results = subject.cloud_services_to_xml(
+        cloud_service_name,
+        {
+          affinity_group_name: 'my-affinity-group',
+          location: 'West US'
+        }
+      )
+      results.must_be_kind_of String
+      doc = Nokogiri::XML results
+      doc.css('ServiceName').text.must_equal(cloud_service_name)
+      doc.css('AffinityGroup').wont_be_empty
+      doc.css('AffinityGroup').text.must_equal('my-affinity-group')
+      doc.css('Location').must_be_empty
+    end
+
+    it 'uses location when affinity group not provided' do
+      results = subject.cloud_services_to_xml(
+        cloud_service_name,
+        {
+          location: 'East Asia'
+        }
+      )
+
+      doc = Nokogiri::XML(results)
+      doc.css('AffinityGroup').must_be_empty
+      doc.css('Location').wont_be_empty
+      doc.css('Location').text.must_equal('East Asia')
+    end
+
+    it 'serializes extended properties when provided' do
+      xtended_props = {
+        prop_1_name: 'prop_1_value',
+        prop_2_name: 'prop_2_value'
+      }
+      results = subject.cloud_services_to_xml(
+        cloud_service_name,
+        {
+          extended_properties: xtended_props
+        }
+      )
+
+      doc = Nokogiri::XML(results)
+      props_xml = doc.css('ExtendedProperties ExtendedProperty')
+      props_xml.wont_be_empty
+      props_xml.size.must_equal(2)
+      props_xml.css('Name').first.text.must_equal('prop_1_name')
+      props_xml.css('Value').first.text.must_equal(
+        xtended_props[:"#{props_xml.css('Name').first.text}"]
+      )
+      props_xml.css('Name').last.text.must_equal('prop_2_name')
+      props_xml.css('Value').last.text.must_equal(
+        xtended_props[:"#{props_xml.css('Name').last.text}"]
+      )
+    end
+
+    it 'serializes the options hash to xml' do
+      results = subject.cloud_services_to_xml(
+        cloud_service_name,
+        { location: 'East US' }
+      )
+      doc = Nokogiri::XML results
+      doc.css('Location').text.must_equal 'East US'
+      results.must_be_kind_of String
+    end
+  end
+end

data/test/unit/core/auth/shared_key_lite_test.rb

@@ -1,51 +1,51 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# 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 "test_helper"
-require "azure/core/auth/shared_key_lite"
-
-describe Azure::Core::Auth::SharedKeyLite do
-  subject { Azure::Core::Auth::SharedKeyLite.new "account-name", "YWNjZXNzLWtleQ==" }
-  
-  let(:method) { "POST" }
-  let(:uri) { URI.parse "http://dummy.uri/resource" }
-  let(:headers) do
-    {
-      "Content-MD5"=> "foo",
-      "Content-Type"=> "foo",
-      "Date"=> "foo"
-    }
-  end
-  let(:headers_without_date) { 
-    headers_without_date = headers.clone
-    headers_without_date.delete "Date"
-    headers_without_date
-  }
-  
-  describe "sign" do
-    it "creates a signature from the provided HTTP method, uri, and reduced set of standard headers" do
-      subject.sign(method, uri, headers).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
-    end
-
-    it "ignores standard headers other than Content-MD5, Content-Type, and Date" do
-      subject.sign(method, uri, headers.merge({"Content-Encoding"=> "foo"})).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
-    end
-
-    it "throws IndexError when there is no Date header" do
-      assert_raises IndexError do
-        subject.sign(method, uri, headers_without_date)
-      end
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# 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 "test_helper"
+require "azure/core/auth/shared_key_lite"
+
+describe Azure::Core::Auth::SharedKeyLite do
+  subject { Azure::Core::Auth::SharedKeyLite.new "account-name", "YWNjZXNzLWtleQ==" }
+  
+  let(:method) { "POST" }
+  let(:uri) { URI.parse "http://dummy.uri/resource" }
+  let(:headers) do
+    {
+      "Content-MD5"=> "foo",
+      "Content-Type"=> "foo",
+      "Date"=> "foo"
+    }
+  end
+  let(:headers_without_date) { 
+    headers_without_date = headers.clone
+    headers_without_date.delete "Date"
+    headers_without_date
+  }
+  
+  describe "sign" do
+    it "creates a signature from the provided HTTP method, uri, and reduced set of standard headers" do
+      subject.sign(method, uri, headers).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
+    end
+
+    it "ignores standard headers other than Content-MD5, Content-Type, and Date" do
+      subject.sign(method, uri, headers.merge({"Content-Encoding"=> "foo"})).must_equal "account-name:vVFnj/+27JFABZgpt5H8g/JVU2HuWFnjv5aeUIxQvBE="
+    end
+
+    it "throws IndexError when there is no Date header" do
+      assert_raises IndexError do
+        subject.sign(method, uri, headers_without_date)
+      end
+    end
+  end
+end