azurex 0.6.6 → 0.6.7

data/lib/core_ext/ip_addr.rb

@@ -0,0 +1,48 @@
+# Code validate private/public IP acceptable ranges.
+class IPAddr
+  PRIVATE_RANGES = [
+    IPAddr.new('10.0.0.0/8'),
+    IPAddr.new('172.16.0.0/12'),
+    IPAddr.new('192.168.0.0/16')
+  ]
+
+  def private?
+    return false unless self.ipv4?
+    PRIVATE_RANGES.each do |ipr|
+      return true if ipr.include?(self)
+    end
+    false
+  end
+
+  def public?
+    !private?
+  end
+
+  class << self
+    def validate_ip_and_prefix(ip, cidr)
+      if cidr.to_s.empty?
+        raise "Cidr is missing for IP '#{ip}'."
+      elsif valid?(ip)
+        raise "Ip address '#{ip}' is invalid."
+      elsif !IPAddr.new(ip).private?
+        raise "Ip Address #{ip} must be private."
+      end
+    end
+
+    def validate_address_space(ip)
+      if ip.split('/').size != 2
+        raise "Cidr is invalid for IP #{ip}."
+      elsif valid?(ip)
+        raise "Address space '#{ip}' is invalid."
+      end
+    end
+
+    def address_prefix(ip, cidr)
+      ip + '/' + cidr.to_s
+    end
+
+    def valid?(ip)
+      (IPAddr.new(ip) rescue nil).nil?
+    end
+  end
+end

data/lib/core_ext/string.rb

@@ -0,0 +1,27 @@
+class String
+  { reset:  0,
+    bold:  1,
+    dark:  2,
+    underline:  4,
+    blink:  5,
+    orange:  6,
+    negative:  7,
+    black: 30,
+    red: 31,
+    green: 32,
+    yellow: 33,
+    blue: 34,
+    magenta: 35,
+    cyan: 36,
+    white: 37,
+  }.each do |key, value|
+    define_method key do
+      "\e[#{value}m" + self + "\e[0m"
+    end
+  end
+
+  def resembles_base64?
+    self.chomp.length % 4 == 0 && self.chomp =~ /^[A-Za-z0-9+\/=]+\Z/
+  end
+end
+

data/test/fixtures/get_storage_account_properties.xml

@@ -14,11 +14,13 @@
       <Endpoint>http://storageacc.queue.core.windows.net/</Endpoint>
       <Endpoint>http://storageacc.table.core.windows.net/</Endpoint>
     </Endpoints>
-    <GeoReplicationEnabled>false</GeoReplicationEnabled>
-    <GeoPrimaryRegion>East US</GeoPrimaryRegion>
-    <GeoSecondaryRegion/>
-    <CreationTime>2013-12-03T19:39:33Z</CreationTime>
+    <GeoPrimaryRegion>West US</GeoPrimaryRegion>
+    <StatusOfPrimary>Available</StatusOfPrimary>
+    <GeoSecondaryRegion>East US</GeoSecondaryRegion>
+    <StatusOfSecondary>Available</StatusOfSecondary>
+    <CreationTime>2013-03-06T09:34:37Z</CreationTime>
     <CustomDomains/>
+    <AccountType>Standard_GRS</AccountType>
   </StorageServiceProperties>
   <ExtendedProperties>
     <ExtendedProperty>

data/test/fixtures/list_storage_accounts.xml

@@ -19,6 +19,7 @@
       <StatusOfPrimary/>
       <GeoSecondaryRegion>East US</GeoSecondaryRegion>
       <StatusOfSecondary/>
+      <AccountType>Standard_GRS</AccountType>
     </StorageServiceProperties>
     <ExtendedProperties/>
   </StorageService>
@@ -40,6 +41,7 @@
       <StatusOfPrimary/>
       <GeoSecondaryRegion>East US</GeoSecondaryRegion>
       <StatusOfSecondary/>
+      <AccountType>Standard_GRS</AccountType>
     </StorageServiceProperties>
     <ExtendedProperties/>
   </StorageService>

data/test/fixtures/list_vmimages.xml

@@ -0,0 +1,86 @@
+<VMImages xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <VMImage>
+    <Name>name-of-image</Name>
+    <Label>identifier-of-image</Label>
+    <Category>category-of-image</Category>
+    <Description>description-of-image</Description>
+    <OSDiskConfiguration>
+      <Name>name-of-operating-system-disk</Name>
+      <HostCaching>caching-mode-of-disk</HostCaching>
+      <OSState>state-of-disk</OSState>
+      <OS>operating-system-of-image</OS>
+      <MediaLink>path-to-vhd</MediaLink>
+      <LogicalDiskSizeInGB>size-of-disk</LogicalDiskSizeInGB>
+    </OSDiskConfiguration>
+    <DataDiskConfigurations>
+      <DataDiskConfiguration>
+        <Name>name-of-data-disk</Name>
+        <HostCaching>caching-mode-of-disk</HostCaching>
+        <Lun>logical-unit-number</Lun>
+        <MediaLink>path-to-vhd</MediaLink>
+        <LogicalDiskSizeInGB>size-of-disk</LogicalDiskSizeInGB>
+      </DataDiskConfigurations>
+    </DataDiskConfiguration>
+    <ServiceName>name-of-cloud-service</ServiceName>
+    <DeploymentName>name-of-deployment</DeploymentName>
+    <RoleName>name-of-virtual-machine</RoleName>
+    <Location>geo-location-of-image-blobs</Location>
+    <AffinityGroup>name-of-affinity-group</AffinityGroup>
+    <CreatedTime>creation-time-of-image</CreatedTime>
+    <ModifiedTime>modification-time-of-image</ModifiedTime>
+    <Language>language-of-image</Language>
+    <ImageFamily>image-family</ImageFamily>
+    <RecommendedVMSize>size-of-virtual-machine</RecommendedVMSize>
+    <IsPremium>indicator-of-image-status</IsPremium>
+    <Eula>image-eula</Eula>
+    <IconUri>uri-of-icon</IconUri>
+    <SmallIconUri>uri-of-icon</SmallIconUri>
+    <PrivacyUri>uri-of-privacy-policy</PrivacyUri>
+    <PublisherName>publisher-identifier</PublisherName>
+    <PublishedDate>published-date</PublishedDate>
+    <ShowInGui>indicator-of-availability</ShowInGui>
+    <PricingDetailLink>pricing-details</PricingDetailLink>
+  </VMImage>
+  <VMImage>
+    <Name>name-of-image-2</Name>
+    <Label>identifier-of-image-2</Label>
+    <Category>category-of-image-2</Category>
+    <Description>description-of-image-2</Description>
+    <OSDiskConfiguration>
+      <Name>name-of-operating-system-disk-2</Name>
+      <HostCaching>caching-mode-of-disk-2</HostCaching>
+      <OSState>state-of-disk-2</OSState>
+      <OS>operating-system-of-image-2</OS>
+      <MediaLink>path-to-vhd-2</MediaLink>
+      <LogicalDiskSizeInGB>size-of-disk-2</LogicalDiskSizeInGB>
+    </OSDiskConfiguration>
+    <DataDiskConfigurations>
+      <DataDiskConfiguration>
+        <Name>name-of-data-disk-2</Name>
+        <HostCaching>caching-mode-of-disk-2</HostCaching>
+        <Lun>logical-unit-number-2</Lun>
+        <MediaLink>path-to-vhd-2</MediaLink>
+        <LogicalDiskSizeInGB>size-of-disk-2</LogicalDiskSizeInGB>
+      </DataDiskConfigurations>
+    </DataDiskConfiguration>
+    <ServiceName>name-of-cloud-service-2</ServiceName>
+    <DeploymentName>name-of-deployment-2</DeploymentName>
+    <RoleName>name-of-virtual-machine-2</RoleName>
+    <Location>geo-location-of-image-blobs-2</Location>
+    <AffinityGroup>name-of-affinity-group-2</AffinityGroup>
+    <CreatedTime>creation-time-of-image-2</CreatedTime>
+    <ModifiedTime>modification-time-of-image-2</ModifiedTime>
+    <Language>language-of-image-2</Language>
+    <ImageFamily>image-family-2</ImageFamily>
+    <RecommendedVMSize>size-of-virtual-machine-2</RecommendedVMSize>
+    <IsPremium>indicator-of-image-status-2</IsPremium>
+    <Eula>image-eula-2</Eula>
+    <IconUri>uri-of-icon-2</IconUri>
+    <SmallIconUri>uri-of-icon-2</SmallIconUri>
+    <PrivacyUri>uri-of-privacy-policy-2</PrivacyUri>
+    <PublisherName>publisher-identifier-2</PublisherName>
+    <PublishedDate>published-date-2</PublishedDate>
+    <ShowInGui>indicator-of-availability-2</ShowInGui>
+    <PricingDetailLink>pricing-details-2</PricingDetailLink>
+  </VMImage>
+</VMImages>

data/test/fixtures/updated_storage_accounts.xml

@@ -18,6 +18,7 @@
       <StatusOfPrimary/>
       <GeoSecondaryRegion>East US</GeoSecondaryRegion>
       <StatusOfSecondary/>
+      <AccountType>Standard_GRS</AccountType>
     </StorageServiceProperties>
     <ExtendedProperties/>
   </StorageService>
@@ -38,6 +39,7 @@
       <StatusOfPrimary/>
       <GeoSecondaryRegion>East US</GeoSecondaryRegion>
       <StatusOfSecondary/>
+      <AccountType>Standard_GRS</AccountType>
     </StorageServiceProperties>
     <ExtendedProperties>
     	<ExtendedProperty>

data/test/integration/affinity_group/Create_Affinity_test.rb

@@ -47,7 +47,7 @@ describe Azure::BaseManagementService do
       exception = assert_raises(RuntimeError) do
         subject.create_affinity_group(affinity_group_name, 'North West', label)
       end
-      assert_match(/Allowed values are East Asia/i, exception.message)
+      assert_match(/'location' is invalid/i, exception.message)
     end
 
     it 'create new affinity group without optional params' do

data/test/integration/cloud_service/Cloud_Delete_test.rb

@@ -37,8 +37,8 @@ describe Azure::CloudServiceManagementService do
 
     it 'Deletes the cloud service in Windows Azure.' do
       subject.delete_cloud_service(@cloud_name)
-      present = subject.get_cloud_service(@cloud_name)
-      assert_equal present, false
+      cloud_service = subject.get_cloud_service(@cloud_name)
+      cloud_service.must_equal nil
     end
   end
 end

data/test/integration/storage_management/storage_management_test.rb

@@ -47,9 +47,9 @@ describe Azure::StorageManagementService do
     storagelist.must_be_kind_of Array
   end
 
-  it 'get storage account' do
+  it 'get_storage_account return nil if storage account with given name not exists' do
     storage = subject.get_storage_account('nonexistentstorage')
-    storage.must_equal false
+    storage.must_equal nil
   end
 
   it 'create storage account' do
@@ -60,18 +60,18 @@ describe Azure::StorageManagementService do
       geo_replication_enabled: 'false'
     }
     subject.create_storage_account(storage_name, options)
-    present = subject.get_storage_account(storage_name)
-    present.must_equal true
+    storage_account = subject.get_storage_account(storage_name)
+    storage_account.must_be_kind_of Azure::StorageManagement::StorageAccount
     # Test for delete storage account
     subject.delete_storage_account(storage_name)
-    present = subject.get_storage_account(storage_name)
-    present.must_equal false
+    storage_account = subject.get_storage_account(storage_name)
+    storage_account.must_equal nil
   end
 
   it 'get storage account' do
     storage_name = StorageName
-    present = subject.get_storage_account(storage_name)
-    present.must_equal true
+    storage_account = subject.get_storage_account(storage_name)
+    storage_account.must_be_kind_of Azure::StorageManagement::StorageAccount
   end
 
   it 'get storage account properties' do
@@ -79,7 +79,7 @@ describe Azure::StorageManagementService do
     storage = subject.get_storage_account_properties(storage_name)
     storage.name.must_equal storage_name
     storage.label.must_equal 'storagelabel'
-    storage.geo_replication_enabled.must_equal 'true'
+    storage.account_type.must_equal 'Standard_GRS'
   end
 
   it 'regenerate storage account keys' do
@@ -96,20 +96,7 @@ describe Azure::StorageManagementService do
     storage_name = StorageName
     storage_keys1 = subject.get_storage_account_keys(storage_name)
     storage_keys1.primary_key.wont_be_nil
-    storage_keys1.secondary_key.wont_be_nil   
-  end
-
-  it 'update storage account' do
-    options = {
-      label: 'labelchanged',
-      description: 'description changed'
-    }
-    storage_name = StorageName
-    subject.update_storage_account(storage_name, options)
-    storage = subject.get_storage_account_properties(storage_name)
-    storage.name.must_equal storage_name
-    storage.label.must_equal 'labelchanged'
-    subject.update_storage_account(storage_name, opts)
+    storage_keys1.secondary_key.wont_be_nil
   end
 
   it 'get storage account properties error' do
@@ -160,18 +147,38 @@ describe Azure::StorageManagementService do
     assert_match('The affinity group does not exist.', exception.message)
   end
 
-  it 'update storage account with non existent storage name' do
-    options = {
-      label: 'labelchanged',
-      description: 'description changed'
-    }
-    storage_name = 'storage_nonexistent'
-    storage = subject.update_storage_account(storage_name, options)
-    assert_match(/Storage Account 'storage_nonexistent' does not exist. Skipped.../, storage)
-  end
-
   it 'delete storage account that does not exist' do
     msg = subject.delete_storage_account('invalidstorageaccount')
     assert_match(/The storage account 'invalidstorageaccount' was not found./, msg)
   end
+
+  describe '#update_storage_account' do
+
+    it 'update storage account with non existent storage name' do
+      options = {
+        label: 'labelchanged',
+        description: 'description changed'
+      }
+      storage_name = 'storage_nonexistent'
+      storage = subject.update_storage_account(storage_name, options)
+      error_msg = "Storage Account 'storage_nonexistent' does not exist"
+      assert_match(/#{error_msg}/, storage)
+    end
+
+    it 'update existing storage account' do
+      options = {
+        label: 'labelchanged',
+        description: 'description changed',
+        account_type: 'Standard_LRS'
+      }
+      storage_name = StorageName
+      subject.update_storage_account(storage_name, options)
+      storage = subject.get_storage_account_properties(storage_name)
+      storage.name.must_equal storage_name
+      storage.label.must_equal 'labelchanged'
+      storage.account_type.must_equal 'Standard_LRS'
+      opts[:account_type] = 'Standard_GRS'
+      subject.update_storage_account(storage_name, opts)
+    end
+  end
 end

data/test/integration/vm/VM_Delete_test.rb

@@ -45,7 +45,7 @@ describe Azure::VirtualMachineManagementService do
       vm.must_be_nil
       cloud_service = Azure::CloudServiceManagementService.new
       cloud_presence = cloud_service.get_cloud_service(csn)
-      cloud_presence.must_equal false
+      cloud_presence.must_equal nil
     end
 
   end

data/test/integration/vm_image/virtual_machine_image_test.rb

@@ -34,4 +34,4 @@ describe Azure::VirtualMachineImageManagementService do
 
   end
 
-end
+end

data/test/unit/cloud_service_management/cloud_service_management_service_test.rb

@@ -66,14 +66,14 @@ describe Azure::CloudServiceManagementService do
       subject.get_cloud_service 'cloud-service-1'
     end
 
-    it 'returns true if found cloud service with given name' do
+    it 'return cloud service instance if found cloud service with given name' do
       result = subject.get_cloud_service 'cloud-service-1'
-      result.must_equal true
+      result.must_be_kind_of Azure::CloudServiceManagement::CloudService
     end
 
-    it "returns false if cloud service with given name doesn't exists" do
+    it "returns nil if cloud service with given name doesn't exists" do
       result = subject.get_cloud_service 'cloud-service-3'
-      result.must_equal false
+      result.must_equal nil
     end
   end
 

data/test/unit/core_ext/string_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+require 'base64'
+require 'core_ext/string'
+
+describe "string_extensions" do
+  it "can guess reasonably if a string is base64" do
+    sample_string = "so many cloud platforms"
+    enc_string = Base64.encode64(sample_string)
+    assert enc_string.resembles_base64?
+  end
+end

data/test/unit/storage_management/serialization_test.rb

@@ -34,7 +34,7 @@ describe Azure::StorageManagement::Serialization do
   end
 
   describe "#storage_services_to_xml" do
-    let(:storage_service_name) {'storage-service'}
+    let(:storage_service_name) { 'storage-service' }
     let(:storage_options) { {
         :extended_properties=> {
           :prop_1_name=>"prop_1_value"
@@ -57,14 +57,18 @@ describe Azure::StorageManagement::Serialization do
     end
 
     it "serializes the options hash to xml" do
-      results = subject.storage_services_to_xml(storage_service_name, {:location => 'East US'})
+      results = subject.storage_services_to_xml(storage_service_name, :location => 'East US')
       doc = Nokogiri::XML results
       doc.css('Location').text.must_equal 'East US'
       results.must_be_kind_of String
     end
 
     it "uses affinity_group from the hash instead of location" do
-      results = subject.storage_services_to_xml(storage_service_name, {:affinity_group_name => 'my-affinity-group', :location => 'East US'})
+      params = {
+        :affinity_group_name => 'my-affinity-group',
+        :location => 'East US'
+      }
+      results = subject.storage_services_to_xml(storage_service_name, params)
       doc = Nokogiri::XML results
       doc.css('AffinityGroup').text.must_equal 'my-affinity-group'
       results.must_be_kind_of String
@@ -142,15 +146,10 @@ describe Azure::StorageManagement::Serialization do
       }
     }
 
-    let(:no_options_message) {'No options specified'}
-    let(:label_or_desc_required) { 'Either one of Label or Description has to be provided. Both cannot be empty' }
-
-    it "checks if the parameter is nil" do
-      exception = assert_raises RuntimeError do
-        subject.storage_update_to_xml nil
-      end
-      assert_match no_options_message, exception.message
-    end
+    let(:no_options_message) { 'No options specified' }
+    let(:label_or_desc_required) {
+      'Either one of Label or Description has to be provided.'
+    }
 
     it "checks if the parameter is empty" do
       exception = assert_raises RuntimeError do
@@ -232,7 +231,7 @@ describe Azure::StorageManagement::Serialization do
 
   describe "#regenerate_storage_account_keys_from_xml" do
     let(:storage_services_access_keys) { Fixtures["storage_service_keys"] }
-    
+
     it "returns an Array of StorageService instances" do
       storage_keys_xml = Nokogiri::XML(storage_services_access_keys)
       result = subject.storage_account_keys_from_xml storage_keys_xml