azure 0.6.4 → 0.7.0.pre

data/lib/azure/virtual_network_management/serialization.rb

@@ -17,6 +17,7 @@ require 'azure/virtual_network_management/virtual_network'
 module Azure
   module VirtualNetworkManagement
     module Serialization
+      extend Azure::Core::Utility
       def self.virtual_network_from_xml(network_xml)
         virtual_networks = []
         virtual_network_services_xml = network_xml.css(
@@ -37,6 +38,10 @@ module Azure
             virtual_network_service_xml,
             'AffinityGroup'
           )
+          virtual_network.location = xml_content(
+            virtual_network_service_xml,
+            'Location'
+          )
           virtual_network.state = xml_content(
             virtual_network_service_xml,
             'State'
@@ -70,7 +75,7 @@ module Azure
       end
 
       def self.virtual_network_to_xml(vnet_name,
-                                      affinity_group,
+                                      location,
                                       address_spaces,
                                       options = {})
         options[:dns] ||= {}
@@ -104,6 +109,7 @@ module Azure
                     }
                     virtual_network_site(xml,
                                          vnet.name,
+                                         vnet.location,
                                          vnet.affinity_group,
                                          vnet.address_space,
                                          others)
@@ -111,7 +117,8 @@ module Azure
                 end
                 virtual_network_site(xml,
                                      vnet_name,
-                                     affinity_group,
+                                     location,
+                                     nil,
                                      address_spaces,
                                      options)
               end
@@ -125,12 +132,14 @@ module Azure
 
       def self.virtual_network_site(xml,
                                     vnet_name,
+                                    location,
                                     affinity_group,
                                     address_spaces,
                                     options)
         xml.VirtualNetworkSite(
           'name' => vnet_name,
-          'AffinityGroup' => affinity_group
+          'AffinityGroup' => affinity_group,
+          'Location' => location
         ) do
           xml.DnsServersRef do
             options[:dns].each do |dns|
@@ -159,8 +168,6 @@ module Azure
       end
 
       def self.dns_server_to_xml(xml, dns_servers, new_dns_servers)
-        dns_names = []
-
         dns_list = {}
         dns_list.merge!(merge_dns(new_dns_servers))
         dns_list.merge!(merge_dns(dns_servers))

data/lib/azure/virtual_network_management/virtual_network.rb

@@ -31,6 +31,7 @@ module Azure
       attr_accessor :subnets
       attr_accessor :dns_servers
       attr_accessor :affinity_group
+      attr_accessor :location
     end
   end
 end

data/lib/azure/virtual_network_management/virtual_network_management_service.rb

@@ -17,7 +17,7 @@ require 'azure/virtual_network_management/serialization'
 module Azure
   module VirtualNetworkManagement
     # VirtualNetworkManagementService
-    class VirtualNetworkManagementService < BaseManagementService
+    class VirtualNetworkManagementService < BaseManagement::BaseManagementService
       def initialize
         super()
       end
@@ -25,13 +25,13 @@ module Azure
       # Public: Gets a list of virtual network services available under the
       # current subscription.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157185.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157185.aspx
       #
       # Returns an array of
       # Azure::VirtualNetworkServiceManagement::VirtualNetwork objects
       def list_virtual_networks
         request_path = '/services/networking/virtualnetwork'
-        request = ManagementHttpRequest.new(:get, request_path, nil)
+        request = BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.virtual_network_from_xml(response)
       end
@@ -54,7 +54,7 @@ module Azure
       # ==== Attributes
       #
       # * +vnet+              - String. The name of the virtual network.
-      # * +affinity_group+    - String. The name of the affinity group.
+      # * +location+          - String. The location where the virtual network will be created.
       # * +address_space+     - Array. Contains a collection of Classless
       #   Inter-Domain Routing (CIDR) identifiers that specify the address
       #   space that you will use for your local network site
@@ -69,11 +69,11 @@ module Azure
       # * +dns_servers+         - Array. A hash of the name/value pairs.
       #   Contains the name and IPv4 address of the DNS server. (optional)
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj157181.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/jj157181.aspx
       #
       # Returns None
       def set_virtual_network(vnet,
-                              affinity_group,
+                              location,
                               address_space,
                               options = {
                                 subnet: [],
@@ -81,12 +81,12 @@ module Azure
                               })
         request_path = '/services/networking/media'
         body = Serialization.virtual_network_to_xml(vnet,
-                                                    affinity_group,
+                                                    location,
                                                     address_space,
                                                     options)
-        request = ManagementHttpRequest.new(:put, request_path, body)
+        request = BaseManagement::ManagementHttpRequest.new(:put, request_path, body)
         request.headers['Content-Type'] = 'text/plain'
-        Loggerx.info "Creating virtual network #{vnet}."
+        Azure::Loggerx.info "Creating virtual network #{vnet}."
         request.call
       end
 
@@ -99,9 +99,9 @@ module Azure
         else
           body = File.read(file)
         end
-        request = ManagementHttpRequest.new(:put, request_path, body)
+        request = BaseManagement::ManagementHttpRequest.new(:put, request_path, body)
         request.headers['Content-Type'] = 'text/plain'
-        Loggerx.info 'Creating virtual network.'
+        Azure::Loggerx.info 'Creating virtual network.'
         request.call
       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_images.xml → list_os_images.xml}

@@ -59,7 +59,7 @@
     <Name>b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-12_04_2-LTS-amd64-server-20130325-en-us-30GB</Name>
     <OS>Linux</OS>
     <Eula>http://www.ubuntu.com/project/about-ubuntu/licensing;http://www.ubuntu.com/aboutus/privacypolicy;http://www.ubuntu.com/aboutus/privacypolicy</Eula>
-    <Description>Ubuntu Server 12.04.2 LTS (amd64 20130325) for Windows Azure. Ubuntu Server is the world's most popular Linux for cloud environments. Updates and patches for Ubuntu 12.04.2 LTS will be available until 2017-04-26.  Ubuntu Server is the perfect platform for all workloads from web applications to NoSQL databases and Hadoop. More information can be found at:
+    <Description>Ubuntu Server 12.04.2 LTS (amd64 20130325) for Microsoft Azure. Ubuntu Server is the world's most popular Linux for cloud environments. Updates and patches for Ubuntu 12.04.2 LTS will be available until 2017-04-26.  Ubuntu Server is the perfect platform for all workloads from web applications to NoSQL databases and Hadoop. More information can be found at:
 http://www.ubuntu.com/business/server</Description>
   </OSImage> 
   <OSImage>

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_vm_images.xml

@@ -0,0 +1,21 @@
+<VMImages>
+  <VMImage>
+    <Name>Ansible-20140729-87566</Name>
+    <Label>Ansible image</Label>
+    <Category>User</Category>
+    <OSDiskConfiguration>
+      <Name>Ansible-20140729-87566-os-2014-07-29</Name>
+      <HostCaching>ReadWrite</HostCaching>
+      <OSState>Specialized</OSState>
+      <OS>Linux</OS>
+      <MediaLink>http://mystorage.blob.core.windows.net/vhds/Ansible-20140729-87566-os-2014-07-29.vhd</MediaLink>
+      <LogicalDiskSizeInGB>30</LogicalDiskSizeInGB>
+    </OSDiskConfiguration>
+    <DataDiskConfigurations />
+    <ServiceName>ansibles</ServiceName>
+    <DeploymentName>Ansible</DeploymentName>
+    <RoleName>Ansible</RoleName>
+    <Location>West US</Location>
+    <CreatedTime>2014-07-29T09:22:41.5598445Z</CreatedTime>
+  </VMImage>
+</VMImages>

data/test/fixtures/metrics.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Metrics>
+<HourMetrics>
   <Version>1.0</Version>
   <Enabled>true</Enabled>
   <IncludeAPIs>false</IncludeAPIs>
@@ -7,4 +7,4 @@
     <Enabled>true</Enabled>
     <Days>7</Days>
   </RetentionPolicy>
-</Metrics>
+</HourMetrics>

data/test/fixtures/sb_default_create_relay_response.xml

@@ -0,0 +1,15 @@
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <id>https://gmonfort.servicebus.windows.net/gfyhfiwdqger</id>
+  <title type="text">gfyhfiwdqger</title>
+  <published>2012-06-06T05:00:06Z</published>
+  <updated>2012-06-06T05:00:06Z</updated>
+  <author><name>gmonfort</name></author>
+  <link rel="self" href="https://gmonfort.servicebus.windows.net/gfyhfiwdqg"/>
+  <content type="application/xml">
+    <RelayDescription xmlns="http://schemas.microsoft.com/netservices/2010/10/servicebus/connect" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+      <RelayType>Http</RelayType>
+      <RequiresClientAuthorization>true</RequiresClientAuthorization>
+      <RequiresTransportSecurity>true</RequiresTransportSecurity>
+    </RelayDescription>
+  </content>
+</entry>

data/test/fixtures/storage_service_keys.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<StorageService>
+    <Url>https://management.core.windows.net/268a3762-fce0-4cd3-a4ea-80e84bddff87/services/storageservices/mystorageaccount</Url>
+    <StorageServiceKeys>
+        <Primary>NUDgoUeopv3eacgEQYhLlPCq751UBzcfn9AR3YWHXJu4m+A==</Primary>
+        <Secondary>7M+cT1mt4YqJ7mQ5bK+/MZwk1tdwaKKivA0hg==</Secondary>
+    </StorageServiceKeys>
+</StorageService>

data/test/fixtures/storage_service_properties.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <StorageServiceProperties>
+  <DefaultServiceVersion>2011-08-18</DefaultServiceVersion>
   <Logging>
     <Version>1.0</Version>
     <Delete>true</Delete>
@@ -10,7 +11,7 @@
       <Days>7</Days>
     </RetentionPolicy>
   </Logging>
-  <Metrics>
+  <HourMetrics>
     <Version>1.0</Version>
     <Enabled>true</Enabled>
     <IncludeAPIs>false</IncludeAPIs>
@@ -18,6 +19,37 @@
       <Enabled>true</Enabled>
       <Days>7</Days>
     </RetentionPolicy>
-  </Metrics>
-  <DefaultServiceVersion>2011-08-18</DefaultServiceVersion>
+  </HourMetrics>
+  <MinuteMetrics>
+    <Version>1.0</Version>
+    <Enabled>true</Enabled>
+    <IncludeAPIs>false</IncludeAPIs>
+    <RetentionPolicy>
+      <Enabled>true</Enabled>
+      <Days>7</Days>
+    </RetentionPolicy>
+  </MinuteMetrics>
+  <Cors>
+    <CorsRule>
+      <AllowedOrigins>http://www.contoso.com,http://dummy.uri</AllowedOrigins>
+      <AllowedMethods>PUT,HEAD</AllowedMethods>
+      <MaxAgeInSeconds>5</MaxAgeInSeconds>
+      <ExposedHeaders>x-ms-*</ExposedHeaders>
+      <AllowedHeaders>x-ms-blob-content-type,x-ms-blob-content-disposition</AllowedHeaders>
+    </CorsRule>
+    <CorsRule>
+      <AllowedOrigins>*</AllowedOrigins>
+      <AllowedMethods>PUT,GET</AllowedMethods>
+      <MaxAgeInSeconds>5</MaxAgeInSeconds>
+      <ExposedHeaders>x-ms-*</ExposedHeaders>
+      <AllowedHeaders>x-ms-blob-content-type,x-ms-blob-content-disposition</AllowedHeaders>
+    </CorsRule>
+    <CorsRule>
+      <AllowedOrigins>http://www.contoso.com</AllowedOrigins>
+      <AllowedMethods>GET</AllowedMethods>
+      <MaxAgeInSeconds>5</MaxAgeInSeconds>
+      <ExposedHeaders>x-ms-*</ExposedHeaders>
+      <AllowedHeaders>x-ms-client-request-id</AllowedHeaders>
+    </CorsRule>
+  </Cors>
 </StorageServiceProperties>

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/fixtures/virtual_machine.xml

@@ -78,7 +78,9 @@ kZS1mYWNlNSI+DQogICAgPEluc3RhbmNlcyBjb3VudD0iMSIgLz4NCiAgPC9Sb2xlPg0KPC9TZXJ2aWN
               <Vip>137.117.17.187</Vip>
             </InputEndpoint>
           </InputEndpoints>
-          <SubnetNames/>
+           <SubnetNames>
+            <SubnetName>test-subnet</SubnetName>
+          </SubnetNames>
         </ConfigurationSet>
       </ConfigurationSets>
       <AvailabilitySetName>vm-availability</AvailabilitySetName>

data/test/integration/affinity_group/Affinity_test.rb

@@ -24,7 +24,7 @@ describe Azure::BaseManagementService do
     let(:options) { { description: 'Some Description' } }
 
     before do
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     end
 
     it 'get affinity group properties for an existing group' do

data/test/integration/affinity_group/Create_Affinity_test.rb

@@ -15,13 +15,14 @@
 require 'integration/test_helper'
 
 describe Azure::BaseManagementService do
+  include Azure::Core::Utility
 
   subject { Azure::BaseManagementService.new }
   let(:affinity_group_name) { random_string('affinity-group-', 10) }
-  let(:location) { WindowsImageLocation }
+  let(:image_location) { WindowsImageLocation }
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   let(:label) { 'Label Name' }
@@ -31,13 +32,13 @@ describe Azure::BaseManagementService do
 
     it 'create new affinity group with valid params' do
       subject.create_affinity_group(affinity_group_name,
-                                    location,
+                                    image_location,
                                     label,
                                     options)
       affinity_group = subject.get_affinity_group(affinity_group_name)
       affinity_group.must_be_kind_of Azure::BaseManagement::AffinityGroup
       affinity_group.name.wont_be_nil
-      affinity_group.location.must_equal location
+      affinity_group.location.must_equal image_location
       affinity_group.name.must_equal affinity_group_name
       affinity_group.label.must_equal label
       affinity_group.description.must_equal options[:description]
@@ -47,15 +48,15 @@ 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(/Allowed values are Central US,South Central US,West US,East US,East US 2,North Europe,West Europe,Southeast Asia,East Asia,Japan West,Japan East,Brazil South/i, exception.message)
     end
 
     it 'create new affinity group without optional params' do
-      subject.create_affinity_group(affinity_group_name, location, label)
+      subject.create_affinity_group(affinity_group_name, image_location, label)
       affinity_group = subject.get_affinity_group(affinity_group_name)
       affinity_group.must_be_kind_of Azure::BaseManagement::AffinityGroup
       affinity_group.name.wont_be_nil
-      affinity_group.location.must_equal location
+      affinity_group.location.must_equal image_location
       affinity_group.name.must_equal affinity_group_name
       affinity_group.label.must_equal label
     end

data/test/integration/affinity_group/Delete_Affinity_test.rb

@@ -17,18 +17,18 @@ require 'integration/test_helper'
 describe Azure::BaseManagementService do
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   subject { Azure::BaseManagementService.new }
   let(:affinity_group_name) { AffinityGroupNameHelper.name }
-  let(:location) { WindowsImageLocation }
+  let(:image_location) { WindowsImageLocation }
   let(:label) { 'Label Name' }
 
   describe '#delete_affinity_group' do
 
     it 'delete affinity group' do
-      subject.create_affinity_group(affinity_group_name, location, label)
+      subject.create_affinity_group(affinity_group_name, image_location, label)
       subject.delete_affinity_group(affinity_group_name)
       affinity_list = subject.list_affinity_groups.select do |x|
         x.name == affinity_group_name

data/test/integration/affinity_group/List_Affinity_test.rb

@@ -20,7 +20,7 @@ describe Azure::BaseManagementService do
   let(:affinity_group_name) { AffinityGroupNameHelper.name }
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     subject.create_affinity_group(affinity_group_name,
                                   WindowsImageLocation,
                                   'Label Name')

data/test/integration/affinity_group/Update_Affinity_test.rb

@@ -15,23 +15,24 @@
 require 'integration/test_helper'
 
 describe Azure::BaseManagementService do
-  AffinityGroupName = random_string('affinity-group-', 10)
+  util = Class.new.extend(Azure::Core::Utility)
+  AffinityGroupName = util.random_string('affinity-group-', 10)
+
   Azure::BaseManagementService.new.create_affinity_group(
-    AffinityGroupName,
-    WindowsImageLocation,
-    'Label'
+      AffinityGroupName,
+      WindowsImageLocation,
+      'Label'
   )
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   subject { Azure::BaseManagementService.new }
   let(:affinity_group_name) { AffinityGroupName }
-  let(:location) { 'Central US' }
 
   describe '#update_affinity_group' do
-    let(:options) { { description: 'sample description' } }
+    let(:options) { {description: 'sample description'} }
 
     it 'update affinity group' do
       label = 'updated label'
@@ -61,7 +62,7 @@ describe Azure::BaseManagementService do
     end
 
     it 'error if description content exceeds allowed limit of 1024 chars' do
-      options = { description: 'a' * 1025 }
+      options = {description: 'a' * 1025}
       exception = assert_raises(RuntimeError) do
         subject.update_affinity_group(affinity_group_name,
                                       'this is update operation',