azure-armrest 0.0.3 → 0.0.4

data/lib/azure/armrest/network/network_security_group_service.rb

@@ -2,94 +2,15 @@ module Azure
   module Armrest
     module Network
       # Class for managing network security groups.
-      class NetworkSecurityGroupService < ArmrestService
+      class NetworkSecurityGroupService < ResourceGroupBasedService
 
         # Creates and returns a new NetworkSecurityGroupService instance.
         #
         def initialize(_armrest_configuration, options = {})
           super
           @provider = options[:provider] || 'Microsoft.Network'
-          set_service_api_version(options, 'networkSecurityGroups')
-        end
-
-        # Return information for the given network security group name for the
-        # provided +resource_group+. If no group is specified, it will use the
-        # resource group set in the constructor.
-        #
-        # Example:
-        #
-        #   # Where 'your_security_group' is likely same as the name of a VM.
-        #   nsg.get('your_security_group', 'your_resource_group')
-        #
-        def get(ns_group_name, resource_group = armrest_configuration.resource_group)
-          raise ArgumentError, "must specify resource group" unless resource_group
-          url = build_url(resource_group, ns_group_name)
-          JSON.parse(rest_get(url))
-        end
-
-        # Returns a list of available network security groups for the given subscription
-        # for the provided +group+, or for all resource groups if no group is specified.
-        #
-        def list(group = nil)
-          if group
-            url = build_url(group)
-            JSON.parse(rest_get(url))['value']
-          else
-            array = []
-            threads = []
-            mutex = Mutex.new
-
-            resource_groups.each do |rg|
-              threads << Thread.new(rg['name']) do |group|
-                url = build_url(group)
-                response = rest_get(url)
-                results = JSON.parse(response)['value']
-                if results && !results.empty?
-                  mutex.synchronize{
-                    results.each{ |hash| hash['resourceGroup'] = group }
-                    array << results
-                  }
-                end
-              end
-            end
-
-            threads.each(&:join)
-
-            array.flatten
-          end
-        end
-
-        # List all network security groups for the current subscription.
-        #
-        def list_all_for_subscription
-          sub_id = armrest_configuration.subscription_id
-          url = File.join(
-            Azure::Armrest::COMMON_URI, sub_id, 'providers',
-            @provider, 'networkSecurityGroups'
-          )
-          url << "?api-version=#{@api_version}"
-          JSON.parse(rest_get(url))['value']
-        end
-
-        alias list_all list_all_for_subscription
-
-        private
-
-        # Builds a URL based on subscription_id an resource_group and any other
-        # arguments provided, and appends it with the api-version.
-        def build_url(resource_group, *args)
-          url = File.join(
-            Azure::Armrest::COMMON_URI,
-            armrest_configuration.subscription_id,
-            'resourceGroups',
-            resource_group,
-            'providers',
-            @provider,
-            'networkSecurityGroups',
-          )
-
-          url = File.join(url, *args) unless args.empty?
-          url << "?api-version=#{@api_version}"
+          @service_name = 'networkSecurityGroups'
+          set_service_api_version(options, @service_name)
         end
       end
     end # Network

data/lib/azure/armrest/network/subnet_service.rb

@@ -3,16 +3,6 @@ module Azure
     module Network
       # Base class for managing subnets
       class SubnetService < VirtualNetworkService
-
-        # Create and return a new SubnetService instance. Most methods for a
-        # SubnetService instance will return one or Subnet instances.
-        #
-        def initialize(_armrest_configuration, options = {})
-          super
-          @provider = options[:provider] || 'Microsoft.Network'
-          set_service_api_version(options, 'virtualNetworks')
-        end
-
         # Creates a new +subnet_name+ on +virtual_network+ using the given
         # +options+.  The +options+ argument is a hash that supports the
         # following keys and subkeys.
@@ -24,13 +14,8 @@ module Azure
         #   - :routeTable
         #     - :id
         #
-        def create(subnet_name, virtual_network, options = {}, resource_group = armrest_configuration.resource_group)
-          resource_group = options.delete(:resource_group) || resource_group
-          raise ArgumentError, "no resource group provided" unless resource_group 
-          url = build_url(resource_group, virtual_network, subnet_name)
-          body = options.to_json
-          response = rest_put(url, body)
-          response.return!
+        def create(subnet_name, virtual_network, resource_group = armrest_configuration.resource_group, options = {})
+          super(combine(virtual_network, subnet_name), resource_group, options)
         end
 
         alias update create
@@ -38,33 +23,33 @@ module Azure
         # Deletes the given +subnet_name+ in +virtual_network+.
         #
         def delete(subnet_name, virtual_network, resource_group = armrest_configuration.resource_group)
-          raise ArgumentError, "no resource group provided" unless resource_group
-          url = build_url(resource_group, virtual_network, subnet_name)
-          response = rest_delete(url)
-          response.return!
+          super(combine(virtual_network, subnet_name), resource_group)
         end
 
         # Retrieves information for the provided +subnet_name+ in +virtual_network+ for
         # the current subscription.
         #
         def get(subnet_name, virtual_network, resource_group = armrest_configuration.resource_group)
-          raise ArgumentError, "no resource group provided" unless resource_group 
-          url = build_url(resource_group, virtual_network, subnet_name)
-          JSON.parse(rest_get(url))
+          super(combine(virtual_network, subnet_name), resource_group)
         end
 
         # List available subnets on +virtual_network+ for the given +resource_group+.
         #
         def list(virtual_network, resource_group = armrest_configuration.resource_group)
-          raise ArgumentError, "no resource group provided" unless resource_group 
-          url = build_url(resource_group, virtual_network)
-          JSON.parse(rest_get(url))['value']
+          raise ArgumentError, "must specify resource group" unless resource_group
+          raise ArgumentError, "must specify name of the resource" unless virtual_network
+
+          url = build_url(resource_group, virtual_network, 'subnets')
+          response = rest_get(url)
+          JSON.parse(response)['value'].map{ |hash| model_class.new(hash) }
         end
 
+        alias list_all list
+
         private
 
-        def build_url(resource_group, virtual_network_name, *args)
-          super(resource_group, virtual_network_name, 'subnets', *args)
+        def combine(virtual_newtork, subnet)
+          File.join(virtual_newtork, 'subnets', subnet)
         end
       end
     end # Network

data/lib/azure/armrest/network/virtual_network_service.rb

@@ -2,112 +2,15 @@ module Azure
   module Armrest
     module Network
       # Class for managing virtual networks.
-      class VirtualNetworkService < ArmrestService
+      class VirtualNetworkService < ResourceGroupBasedService
 
         # Creates and returns a new VirtualNetworkService instance.
         #
         def initialize(_armrest_configuration, options = {})
           super
           @provider = options[:provider] || 'Microsoft.Network'
-          set_service_api_version(options, 'virtualNetworks')
-        end
-
-        # Return information for the given virtual network for the provided
-        # +resource_group+. If no group is specified, it will use the resource
-        # group set in the constructor.
-        #
-        # Example:
-        #
-        #   vns.get('vn_name', 'your_resource_group')
-        #
-        def get(vn_name, resource_group = armrest_configuration.resource_group)
-          raise ArgumentError, "must specify resource group" unless resource_group
-          url = build_url(resource_group, vn_name)
-          JSON.parse(rest_get(url))
-        end
-
-        # Returns a list of available virtual networks in the current subscription
-        # for the provided +resource_group+.
-        #
-        def list(resource_group = armrest_configuration.resource_group)
-          raise ArgumentError, "no resource group provided" unless resource_group
-          url = build_url(resource_group)
-          JSON.parse(rest_get(url))['value']
-        end
-
-        # List all virtual networks for the current subscription.
-        #
-        def list_all_for_subscription
-          sub_id = armrest_configuration.subscription_id
-          url = File.join(Azure::Armrest::COMMON_URI, sub_id, 'providers', @provider, 'virtualNetworks')
-          url << "?api-version=#{@api_version}"
-          JSON.parse(rest_get(url))['value']
-        end
-
-        alias list_all list_all_for_subscription
-
-        # Delete the given virtual network in +resource_group+.
-        #
-        def delete(vn_name, resource_group = armrest_configuration.resource_group)
-          raise ArgumentError, "must specify resource group" unless resource_group
-
-          url = build_url(resource_group, vn_name)
-          response = rest_delete(url)
-          response.return!
-        end
-
-        # Create a new virtual network, or update an existing virtual network if it
-        # already exists. The first argument is a hash of options.
-        #
-        # - :location
-        # - :tags
-        # - :etag
-        # - :properties
-        #   - :addressSpace
-        #     - :addressPrefixes[]
-        #   - :dhcpOptions
-        #     - :dnsServers[]
-        #     - :subnets
-        #       [
-        #         - :name
-        #         - :properties
-        #           - :addressPrefix
-        #           - :networkSecurityGroup
-        #             - :id
-        #       ]
-        #
-        def create(vn_name, options, resource_group = armrest_configuration.resource_group)
-          resource_group = options.delete(:resource_group) || resource_group
-
-          raise ArgumentError, "no resource group specified" unless resource_group
-
-          body = options.to_json
-
-          url = build_url(resource_group, vn_name)
-
-          response = rest_put(url, body)
-          response.return!
-        end
-
-        alias update create
-
-        private
-
-        # Builds a URL based on subscription_id an resource_group and any other
-        # arguments provided, and appends it with the api-version.
-        def build_url(resource_group, *args)
-          url = File.join(
-            Azure::Armrest::COMMON_URI,
-            armrest_configuration.subscription_id,
-            'resourceGroups',
-            resource_group,
-            'providers',
-            @provider,
-            'virtualNetworks',
-          )
-
-          url = File.join(url, *args) unless args.empty?
-          url << "?api-version=#{@api_version}"
+          @service_name = 'virtualNetworks'
+          set_service_api_version(options, @service_name)
         end
       end
     end # Network

data/lib/azure/armrest/resource_group_based_service.rb

@@ -0,0 +1,94 @@
+module Azure::Armrest
+  # Base class for services that needs to run in a resource group
+  class ResourceGroupBasedService < ArmrestService
+    def create(name, rgroup = armrest_configuration.resource_group, options = {})
+      raise ArgumentError, "must specify resource group" unless rgroup
+      raise ArgumentError, "must specify name of the resource" unless name
+
+      url = build_url(rgroup, name)
+      url = yield(url) || url if block_given?
+      response = rest_put(build_url(rgroup, name), options.to_json)
+      model_class.new(response) unless response.empty?
+    end
+
+    alias update create
+
+    def list(rgroup = armrest_configuration.resource_group)
+      raise ArgumentError, "must specify resource group" unless rgroup
+
+      url = build_url(rgroup)
+      url = yield(url) || url if block_given?
+      response = rest_get(url)
+      JSON.parse(response)['value'].map{ |hash| model_class.new(hash) }
+    end
+
+    def list_all
+      url = build_url
+      url = yield(url) || url if block_given?
+      response = rest_get(url)
+      JSON.parse(response)['value'].map{ |hash| model_class.new(hash) }
+    end
+
+    def get(name, rgroup = armrest_configuration.resource_group)
+      raise ArgumentError, "must specify resource group" unless rgroup
+      raise ArgumentError, "must specify name of the resource" unless name
+
+      url = build_url(rgroup, name)
+      url = yield(url) || url if block_given?
+      response = rest_get(url)
+      model_class.new(response)
+    end
+
+    def delete(name, rgroup= armrest_configuration.resource_group)
+      raise ArgumentError, "must specify resource group" unless rgroup
+      raise ArgumentError, "must specify name of the resource" unless name
+
+      url = build_url(rgroup, name)
+      url = yield(url) || url if block_given?
+      rest_delete(url)
+      nil
+    end
+
+    private
+
+    # Builds a URL based on subscription_id an resource_group and any other
+    # arguments provided, and appends it with the api_version.
+    #
+    def build_url(resource_group = nil, *args)
+      url = File.join(Azure::Armrest::COMMON_URI, armrest_configuration.subscription_id)
+      url = File.join(url, 'resourceGroups', resource_group) if resource_group
+      url = File.join(url, 'providers', @provider, @service_name)
+      url = File.join(url, *args) unless args.empty?
+      url << "?api-version=#{@api_version}"
+    end
+
+    def model_class
+      @model_class ||= Object.const_get(self.class.to_s.sub(/Service$/, ''))
+    end
+
+    # Aggregate resources from each group
+    # To be used in the case that API does not support list_all with one call
+    def list_in_all_groups
+      array = []
+      threads = []
+      mutex = Mutex.new
+
+      resource_groups.each do |rg|
+        threads << Thread.new(rg['name']) do |group|
+          url = build_url(group)
+          response = rest_get(url)
+
+          results = JSON.parse(response)['value'].map { |hash| model_class.new(hash) }
+
+          if results && !results.empty?
+            mutex.synchronize{ array << results }
+          end
+        end
+      end
+
+      threads.each(&:join)
+
+      array.flatten
+    end
+  end
+end

data/lib/azure/armrest/resource_group_service.rb

@@ -31,7 +31,7 @@ module Azure
 
         response = rest_get(URI.escape(url))
 
-        JSON.parse(response.body)["value"]
+        JSON.parse(response)["value"].map{ |hash| Azure::Armrest::ResourceGroup.new(hash) }
       end
 
       # Creates a new +group+ in +location+ for the current subscription.
@@ -43,7 +43,7 @@ module Azure
 
         response = rest_put(url, body)
 
-        JSON.parse(response.body)
+        Azure::Armrest::ResourceGroup.new(response)
       end
 
       # Delete a resource group from the current subscription.
@@ -59,7 +59,7 @@ module Azure
       def get(group)
         url = build_url(group)
         response = rest_get(url)
-        JSON.parse(response.body)
+        Azure::Armrest::ResourceGroup.new(response)
       end
 
       # Updates the tags for the given resource group.

data/lib/azure/armrest/resource_provider_service.rb

@@ -42,7 +42,7 @@ module Azure
       def list
         url = build_url
         response = rest_get(url)
-        JSON.parse(response.body)["value"]
+        JSON.parse(response)["value"].map{ |hash| Azure::Armrest::ResourceProvider.new(hash) }
       end
 
       cache_method(:list, cache_time)
@@ -53,7 +53,7 @@ module Azure
       def get(namespace)
         url = build_url(namespace)
         response = rest_get(url)
-        JSON.parse(response.body)
+        Azure::Armrest::ResourceProvider.new(response)
       end
 
       cache_method(:get, cache_time)
@@ -64,7 +64,7 @@ module Azure
       def list_geo_locations(namespace)
         url = build_url(namespace)
         response = rest_get(url)
-        JSON.parse(response.body)['resourceTypes'].first['locations']
+        JSON.parse(response)['resourceTypes'].first['locations']
       end
 
       cache_method(:list_geo_locations, cache_time)
@@ -75,7 +75,7 @@ module Azure
       def list_api_versions(namespace)
         url = build_url(namespace)
         response = rest_get(url)
-        JSON.parse(response.body)['resourceTypes'].first['apiVersions']
+        JSON.parse(response)['resourceTypes'].first['apiVersions']
       end
 
       cache_method(:list_api_versions, cache_time)

data/lib/azure/armrest/resource_service.rb

@@ -42,7 +42,7 @@ module Azure
 
         response = rest_get(URI.escape(url))
 
-        JSON.parse(response.body)["value"]
+        JSON.parse(response)["value"].map{ |hash| Azure::Armrest::Resource.new(hash) }
       end
 
       # Move the resources from +source_group+ under +source_subscription+,