fog-azure-rm 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9efeefac7a938ff930c43843ac651fb93a38af3555b3241ec970f8aca0e412
-  data.tar.gz: 3dcbbb882dd381a9b52f174f2c62d48ea6247888033820a7b4084eeb05758cb5
+  metadata.gz: 8f2643da5f5306d3ff7cc3d7f64ffd012fe8dd62bd3cf751d3b39efb984fab56
+  data.tar.gz: 2698137885445fde6a1378e0e51d988ce735dca45bb78b5cbdc578c17a686831
 SHA512:
-  metadata.gz: fba09be6a12ab9eb51298ed1ca9ac9a136004c0d1dec6606b4db9ca6125d1eb659c2471f7dc714178f5931f5ca70432d7dfdf2a1f17317ea877296d6f4fcb2f6
-  data.tar.gz: 1f6acc0b6182e755ad8d823bd7a9ff9ea91cc9cf92ad595d91df4258df6feb95518e83982cd5d7034547bab2dc81079b4539829d604e40a259ae5f74513d6b9a
+  metadata.gz: e5dfd85ae82dab94a2ead2195c06776a80c74de916c480c46b88cb07dc5ff8e9ed4fba07f682c281106b59b5704b17bbf0baccc3d485791a1e5249dbc289669a
+  data.tar.gz: 6e4de4154352a2fa6592ae9fdfa8a88ce5f322d4c6d8ef39c6f7cf942df3f85aedccbe00748af26346d0b9cc27f56cf12f25424870f4449c03653b34b42ce1ba

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.7
+
+**Added:**
+- Support added to list resources in a resource group
+- Added OS disk id attribute to the 'Compute' model 
+
 ## 0.4.6
 
 **Added:**

data/lib/fog/azurerm/models/compute/server.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :vm_size
         attribute :storage_account_name
         attribute :os_disk_name
+        attribute :os_disk_id
         attribute :os_disk_vhd_uri
         attribute :os_disk_caching
         attribute :publisher
@@ -46,6 +47,10 @@ module Fog
           hash['vm_size'] = vm.hardware_profile.vm_size unless vm.hardware_profile.vm_size.nil?
           unless vm.storage_profile.nil?
             hash['os_disk_name'] = vm.storage_profile.os_disk.name
+
+            subscription_id = get_subscription_id(vm.id)
+            hash['os_disk_id'] = "/subscriptions/#{subscription_id}/resourceGroups/#{hash['resource_group']}/providers/Microsoft.Compute/disks/#{hash['os_disk_name']}"
+
             hash['os_disk_size'] = vm.storage_profile.os_disk.disk_size_gb
             if vm.storage_profile.os_disk.vhd.nil?
               hash['managed_disk_storage_type'] = vm.storage_profile.os_disk.managed_disk.storage_account_type

data/lib/fog/azurerm/models/resources/azure_resources.rb

@@ -26,6 +26,14 @@ module Fog
         def check_azure_resource_exists(resource_id, api_version)
           service.check_azure_resource_exists(resource_id, api_version)
         end
+
+        def list_resources_in_resource_group(resource_group_name)
+          resources = []
+          service.list_resources_in_resource_group(resource_group_name).each do |resource|
+            resources.push(Fog::Resources::AzureRM::AzureResource.parse(resource))
+          end
+          load(resources)
+        end
       end
     end
   end

data/lib/fog/azurerm/requests/resources/list_resources_in_resource_group.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Resources
+    class AzureRM
+      # This class provides the actual implementation for service calls.
+      class Real
+        def list_resources_in_resource_group(resource_group_name)
+          msg = "Listing Resources in #{resource_group_name}"
+          Fog::Logger.debug msg
+          begin
+            resources = @rmc.resource_groups.list_resources(resource_group_name)
+          rescue MsRestAzure::AzureOperationError => e
+            raise_azure_exception(e, msg)
+          end
+          Fog::Logger.debug "Resources in #{resource_group_name} listed successfully"
+          resources
+        end
+      end
+
+      # This class provides the mock implementation for unit tests.
+      class Mock
+        def list_resources_in_resource_group(*)
+          resources = {
+            'id' => '/subscriptions/########-####-####-####-############/fog-rg',
+            'name' => 'your-resource-name',
+            'type' => 'providernamespace/resourcetype',
+            'location' => 'westus',
+            'tags' =>
+              {
+                tag_name => tag_value
+              },
+            'plan' =>
+              {
+                'name' => 'free'
+              }
+          }
+          result_mapper = Azure::ARM::Resources::Models::GenericResource.mapper
+          @rmc.deserialize(result_mapper, resources, 'result.body').value
+        end
+      end
+    end
+  end
+end

data/lib/fog/azurerm/resources.rb

@@ -23,6 +23,7 @@ module Fog
       request :list_tagged_resources
       request :tag_resource
       request :check_azure_resource_exists
+      request :list_resources_in_resource_group
 
       model_path 'fog/azurerm/models/resources'
       model :resource_group

data/lib/fog/azurerm/utilities/general.rb

@@ -177,3 +177,7 @@ end
 def get_image_name(id)
   id.split('/').last
 end
+
+def get_subscription_id(id)
+  id.split('/')[2]
+end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.4.6'.freeze
+    VERSION = '0.4.7'.freeze
   end
 end

data/test/api_stub/models/compute/server.rb

@@ -21,6 +21,7 @@ module ApiStub
                 },
                 'osDisk' => {
                   'name' => 'fog-test-server_os_disk',
+                  'id' => '/subscriptions/########-####-####-####-############/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/fog-test-server_os_disk',
                   'vhd' => {
                     'uri' => 'http://storageAccount.blob.core.windows.net/vhds/fog-test-server_os_disk.vhd'
                   }

data/test/api_stub/models/resources/resource.rb

@@ -37,6 +37,23 @@ module ApiStub
           result_mapper = Azure::ARM::Resources::Models::ResourceListResult.mapper
           client.deserialize(result_mapper, Fog::JSON.decode(resources), 'result.body').value
         end
+
+        def self.list_resources_in_resource_group_response(client)
+          resources = '{
+            "id": "/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}",
+            "name": "your-resource-name",
+                "type": "providernamespace/resourcetype",
+                "location": "westus",
+                "tags": {
+                "tag_name": "tag_value"
+            },
+                "plan": {
+                "name": "free"
+            }
+          }'
+          result_mapper = Azure::ARM::Resources::Models::GenericResource.mapper
+          client.deserialize(result_mapper, Fog::JSON.decode(resources), 'result.body')
+        end
       end
     end
   end

data/test/api_stub/requests/compute/virtual_machine.rb

@@ -243,6 +243,7 @@ module ApiStub
                 },
                 "osDisk": {
                   "name":"myosdisk1",
+                  "id":"/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1",
                   "vhd": {
                     "uri":"http://mystorage1.blob.core.windows.net/vhds/myosdisk1.vhd"
                   },
@@ -320,6 +321,7 @@ module ApiStub
                 },
                 "osDisk": {
                   "name":"myosdisk1",
+                  "id":"/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1",
                   "vhd": {
                     "uri":"http://mystorage1.blob.core.windows.net/vhds/myosdisk1.vhd"
                   },
@@ -397,6 +399,7 @@ module ApiStub
                 },
                 "osDisk": {
                   "name":"myosdisk1",
+                  "id":"/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1",
                   "vhd": {
                     "uri":"https://custimagestorage.blob.core.windows.net/customimage/trusty-server-cloudimg-amd64-disk1.vhd"
                   },
@@ -474,6 +477,7 @@ module ApiStub
                 },
                 "osDisk": {
                   "name":"myosdisk1",
+                  "id":"/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1",
                   "vhd": {
                     "uri":"http://mystorage1.blob.core.windows.net/vhds/myosdisk1.vhd"
                   },
@@ -546,6 +550,7 @@ module ApiStub
                     'osDisk' =>
                       {
                         'name' => 'myosdisk1',
+                        'id' => '/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1',
                         'vhd' =>
                           {
                             'uri' => 'http://mystorage1.blob.core.windows.net/vhds/myosdisk1.vhd'
@@ -651,6 +656,7 @@ module ApiStub
                     },
                     "osDisk": {
                       "name":"myosdisk1",
+                      "id":"/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1",
                       "vhd": {
                         "uri":"http://mystorage1.blob.core.windows.net/vhds/myosdisk1.vhd"
                       },
@@ -809,6 +815,7 @@ module ApiStub
                     },
                     "osDisk": {
                       "name":"myosdisk1",
+                      "id":"/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1",
                       "vhd": {
                         "uri":"http://mystorage1.blob.core.windows.net/vhds/myosdisk1.vhd"
                       },
@@ -896,6 +903,7 @@ module ApiStub
                     },
                     "osDisk": {
                       "name":"myosdisk1",
+                      "id":"/subscriptions/{subscription-id}/resourceGroups/fog-test-rg/providers/Microsoft.Compute/disks/myosdisk1",
                       "vhd": {
                         "uri":"http://mystorage1.blob.core.windows.net/vhds/myosdisk1.vhd"
                       },

data/test/api_stub/requests/resources/resource.rb

@@ -39,6 +39,23 @@ module ApiStub
           result_mapper = Azure::ARM::Resources::Models::ResourceListResult.mapper
           client.deserialize(result_mapper, Fog::JSON.decode(body), 'result.body')
         end
+
+        def self.list_resources_in_resource_group(client)
+          body = '{
+            "id": "/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}",
+            "name": "your-resource-name",
+            "type": "providernamespace/resourcetype",
+            "location": "westus",
+            "tags": {
+            "tag_name": "tag_value"
+            },
+            "plan": {
+            "name": "free"
+            }
+          }'
+          result_mapper = Azure::ARM::Resources::Models::GenericResource.mapper
+          client.deserialize(result_mapper, Fog::JSON.decode(body), 'result.body')
+        end
       end
     end
   end

data/test/integration/resource_group.rb

@@ -17,7 +17,6 @@ resource = Fog::Resources::AzureRM.new(
 resource_group_name = "RG-#{current_time}"
 
 begin
-
   ########################################################################################################################
   ######################                   Check Resource Group Exists?                             ######################
   ########################################################################################################################
@@ -51,6 +50,16 @@ begin
   resource_group = resource_groups.get(resource_group_name)
   puts "Get resource group: #{resource_group.name}"
 
+  ########################################################################################################################
+  ######################             Get All Resources in a Resource Group                          ######################
+  ########################################################################################################################
+
+  resources = resource.azure_resources.list_resources_in_resource_group(resource_group_name)
+  puts 'List resources in resource groups:'
+  resources.each do |a_resource|
+    puts a_resource.name
+  end
+
   ########################################################################################################################
   ######################                           Destroy Resource Group                           ######################
   ########################################################################################################################

data/test/models/compute/test_server.rb

@@ -38,6 +38,7 @@ class TestServer < Minitest::Test
       :vm_size,
       :storage_account_name,
       :os_disk_name,
+      :os_disk_id,
       :os_disk_vhd_uri,
       :os_disk_caching,
       :publisher,

data/test/models/resources/test_resources.rb

@@ -14,7 +14,8 @@ class TestResources < Minitest::Test
     methods = [
       :all,
       :get,
-      :check_azure_resource_exists
+      :check_azure_resource_exists,
+      :list_resources_in_resource_group
     ]
     methods.each do |method|
       assert_respond_to @resources, method
@@ -49,4 +50,16 @@ class TestResources < Minitest::Test
       assert !@resources.check_azure_resource_exists(@resource_id, '2016-09-01')
     end
   end
+
+  def test_list_resources_in_resource_group_method_response
+    client = @service.instance_variable_get(:@rmc)
+    response = [ApiStub::Models::Resources::Resource.list_resources_in_resource_group_response(client)]
+    @service.stub :list_resources_in_resource_group, response do
+      assert_instance_of Fog::Resources::AzureRM::AzureResources, @resources.list_resources_in_resource_group('fog-test-rg')
+      assert @resources.list_resources_in_resource_group('fog-test-rg').size >= 1
+      @resources.list_resources_in_resource_group('fog-test-rg').each do |s|
+        assert_instance_of Fog::Resources::AzureRM::AzureResource, s
+      end
+    end
+  end
 end

data/test/requests/resources/test_list_resources_in_resource_group.rb

@@ -0,0 +1,24 @@
+require File.expand_path '../../test_helper', __dir__
+
+# Test class for List Resource Groups Request
+class TestListResources < Minitest::Test
+  def setup
+    @service = Fog::Resources::AzureRM.new(credentials)
+    @client = @service.instance_variable_get(:@rmc)
+    @resources = @client.resource_groups
+  end
+
+  def test_list_resources_in_resource_group_success
+    mocked_response = ApiStub::Requests::Resources::AzureResource.list_resources_in_resource_group(@client)
+    @resources.stub :list_resources, mocked_response do
+      assert_equal @service.list_resources_in_resource_group('fog-test-rg'), mocked_response
+    end
+  end
+
+  def test_list_resources_in_resource_group_failure
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @resources.stub :list_resources, response do
+      assert_raises(MsRestAzure::AzureOperationError) { @service.list_resources_in_resource_group('fog-test-rg') }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -564,6 +564,7 @@ files:
 - lib/fog/azurerm/requests/resources/get_resource_group.rb
 - lib/fog/azurerm/requests/resources/list_deployments.rb
 - lib/fog/azurerm/requests/resources/list_resource_groups.rb
+- lib/fog/azurerm/requests/resources/list_resources_in_resource_group.rb
 - lib/fog/azurerm/requests/resources/list_tagged_resources.rb
 - lib/fog/azurerm/requests/resources/tag_resource.rb
 - lib/fog/azurerm/requests/sql/check_database_exists.rb
@@ -965,6 +966,7 @@ files:
 - test/requests/resources/test_get_resource_group.rb
 - test/requests/resources/test_list_deployments.rb
 - test/requests/resources/test_list_resource_groups.rb
+- test/requests/resources/test_list_resources_in_resource_group.rb
 - test/requests/resources/test_list_tagged_resources.rb
 - test/requests/resources/test_tag_resource.rb
 - test/requests/sql/test_create_or_update_database.rb