fog-azure-rm 0.0.1 → 0.0.2

data/lib/fog/azurerm/models/network/virtual_networks.rb

@@ -12,21 +12,16 @@ module Fog
           requires :resource_group
           virtual_networks = []
           service.list_virtual_networks(resource_group).each do |vnet|
-            hash = {}
-            vnet.instance_variables.each do |var|
-              hash[var.to_s.delete('@')] = vnet.instance_variable_get(var)
-            end
-            hash['resource_group'] = vnet.instance_variable_get('@id').split('/')[4]
-            virtual_networks << hash
+            virtual_networks << Fog::Network::AzureRM::VirtualNetwork.parse(vnet)
           end
           load(virtual_networks)
         end
 
-        def get(identity, resource_group)
-          all.find { |f| f.name == identity && f.resource_group == resource_group }
+        def get(identity)
+          all.find { |f| f.name == identity }
         end
 
-        def check_if_exists(name, resource_group)
+        def check_if_exists(resource_group, name)
           Fog::Logger.debug "Checkng if Virtual Network #{name} exists."
           if service.check_for_virtual_network(name, resource_group)
             Fog::Logger.debug "Virtual Network #{name} exists."

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

@@ -9,7 +9,8 @@ module Fog
         def save
           requires :name
           requires :location
-          service.create_resource_group(name, location)
+          resource_group = service.create_resource_group(name, location)
+          merge_attributes(resource_group)
         end
 
         def destroy

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

@@ -8,15 +8,7 @@ module Fog
         model Fog::Resources::AzureRM::ResourceGroup
 
         def all
-          resource_groups = []
-          service.list_resource_groups.each do |rg|
-            hash = {}
-            rg.instance_variables.each do |var|
-              hash[var.to_s.delete('@')] = rg.instance_variable_get(var)
-            end
-            resource_groups << hash
-          end
-          load(resource_groups)
+          load(service.list_resource_groups)
         end
 
         def get(identity)

data/lib/fog/azurerm/models/storage/storage_account.rb

@@ -1,23 +1,19 @@
-# rubocop:disable LineLength
-# rubocop:disable MethodLength
 module Fog
   module Storage
     class AzureRM
       # This class is giving implementation of create/save and
       # delete/destroy for storage account.
       class StorageAccount < Fog::Model
-        attribute :id
         identity  :name
-        attribute :type
         attribute :location
-        attribute :tags
         attribute :resource_group
-        attribute :properties
+        attribute :account_type
 
         def save
           requires :name
           requires :location
           requires :resource_group
+          hash = {}
           # Create a model for new storage account.
           properties = Azure::ARM::Storage::Models::StorageAccountPropertiesCreateParameters.new
           properties.account_type = 'Standard_LRS' # This might change in the near future!
@@ -25,7 +21,9 @@ module Fog
           params = Azure::ARM::Storage::Models::StorageAccountCreateParameters.new
           params.properties = properties
           params.location = location
-          service.create_storage_account(resource_group, name, params)
+          sa = service.create_storage_account(resource_group, name, params)
+          hash['account_type'] = sa['properties']['accountType']
+          merge_attributes(hash)
         end
 
         def destroy

data/lib/fog/azurerm/models/storage/storage_accounts.rb

@@ -1,8 +1,6 @@
 require 'fog/core/collection'
 require 'fog/azurerm/models/storage/storage_account'
-# rubocop:disable LineLength
-# rubocop:disable MethodLength
-# rubocop:disable AbcSize
+
 module Fog
   module Storage
     class AzureRM
@@ -21,9 +19,10 @@ module Fog
           end
           hash_of_storage_accounts.each do |account|
             hash = {}
-            account.instance_variables.each do |var|
-              hash[var.to_s.delete('@')] = account.instance_variable_get(var)
-            end
+            hash['name'] = account['name']
+            hash['location'] = account['location']
+            hash['resource_group'] = account['id'].split('/')[4]
+            hash['account_type'] =  account['properties']['accountType']
             accounts << hash
           end
           load(accounts)

data/lib/fog/azurerm/network.rb

@@ -24,6 +24,18 @@ module Fog
       request :create_network_interface
       request :delete_network_interface
       request :list_network_interfaces
+      request :create_load_balancer
+      request :delete_load_balancer
+      request :list_load_balancers
+      request :create_network_security_group
+      request :delete_network_security_group
+      request :list_network_security_groups
+      request :create_traffic_manager_profile
+      request :get_traffic_manager_profile
+      request :delete_traffic_manager_profile
+      request :list_traffic_manager_profiles
+      request :create_traffic_manager_endpoint
+      request :delete_traffic_manager_endpoint
 
       model_path 'fog/azurerm/models/network'
       model :virtual_network
@@ -34,6 +46,20 @@ module Fog
       collection :subnets
       model :network_interface
       collection :network_interfaces
+      model :load_balancer
+      collection :load_balancers
+      model :frontend_ip_configuration
+      model :inbound_nat_pool
+      model :inbound_nat_rule
+      model :load_balancing_rule
+      model :probe
+      model :network_security_group
+      collection :network_security_groups
+      model :network_security_rule
+      model :traffic_manager_profile
+      collection :traffic_manager_profiles
+      model :traffic_manager_end_point
+      collection :traffic_manager_end_points
 
       # Mock class for Network Service
       class Mock
@@ -60,6 +86,10 @@ module Fog
           credentials = Fog::Credentials::AzureRM.get_credentials(options[:tenant_id], options[:client_id], options[:client_secret])
           @network_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
           @network_client.subscription_id = options[:subscription_id]
+          @tenant_id = options[:tenant_id]
+          @client_id = options[:client_id]
+          @client_secret = options[:client_secret]
+          @subscription_id = options[:subscription_id]
         end
       end
     end

data/lib/fog/azurerm/requests/compute/create_availability_set.rb

@@ -12,7 +12,7 @@ module Fog
             promise = @compute_mgmt_client.availability_sets.create_or_update(resource_group, name, avail_set_props)
             result = promise.value!
             Fog::Logger.debug "Availability Set #{name} created successfully."
-            result
+            Azure::ARM::Compute::Models::AvailabilitySet.serialize_object(result.body)
           rescue MsRestAzure::AzureOperationError => e
             msg = "Exception creating Availability Set #{name} in Resource Group: #{resource_group}. #{e.body['error']['message']}"
             raise msg
@@ -37,7 +37,18 @@ module Fog
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def create_availability_set(resource_group, name, params)
+        def create_availability_set(resource_group, name, location)
+          {
+            'location' => location,
+            'id' => "/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Compute/availabilitySets/#{name}",
+            'name' => name,
+            'type' => 'Microsoft.Compute/availabilitySets',
+            'properties' =>
+               {
+                 'platformUpdateDomainCount' => 2,
+                 'platformFaultDomainCount' => 2
+               }
+          }
         end
       end
     end

data/lib/fog/azurerm/requests/compute/create_virtual_machine.rb

@@ -3,7 +3,7 @@ module Fog
     class AzureRM
       # This class provides the actual implementation for service calls.
       class Real
-        def create_virtual_machine(name, location, resource_group, vm_size, storage_account_name,
+        def create_virtual_machine(resource_group, name, location, vm_size, storage_account_name,
                                    username, password, disable_password_authentication,
                                    ssh_key_path, ssh_key_data, network_interface_card_id,
                                    availability_set_id, publisher, offer, sku, version)
@@ -92,7 +92,65 @@ module Fog
       end
       # This class provides the mock implementation for unit tests.
       class Mock
-        def create_virtual_machine
+        def create_virtual_machine(resource_group, name, location, vm_size, storage_account_name,
+                                   username, password, disable_password_authentication,
+                                   ssh_key_path, ssh_key_data, network_interface_card_id,
+                                   availability_set_id, publisher, offer, sku, version)
+          {
+            "location"=>location,
+            "id"=>"/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Compute/virtualMachines/#{name}",
+            "name"=>name,
+            "type"=>"Microsoft.Compute/virtualMachines",
+            "properties"=>
+              {
+                "hardwareProfile"=>
+                  {
+                    "vmSize"=>vm_size
+                  },
+                "storageProfile"=>
+                  {
+                    "imageReference"=>
+                      {
+                        "publisher"=>publisher,
+                        "offer"=>offer,
+                        "sku"=>sku,
+                        "version"=>version
+                      },
+                    "osDisk"=>
+                      {
+                        "name"=>"#{name}_os_disk",
+                        "vhd"=>
+                          {
+                            "uri"=>"http://#{storage_account_name}.blob.core.windows.net/vhds/#{name}_os_disk.vhd"
+                          },
+                        "createOption"=>"FromImage",
+                        "osType"=>"Linux",
+                        "caching"=>"ReadWrite"
+                      },
+                    "dataDisks"=>[]
+                  },
+                "osProfile"=>
+                  {
+                    "computerName"=>name,
+                    "adminUsername"=>username,
+                    "linuxConfiguration"=>
+                      {
+                        "disablePasswordAuthentication"=>disable_password_authentication
+                      },
+                    "secrets"=>[]
+                  },
+                "networkProfile"=>
+                  {
+                    "networkInterfaces"=>
+                      [
+                        {
+                          "id"=>"/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/#{network_interface_card_id.split('/')[8]}"
+                        }
+                      ]
+                  },
+                "provisioningState"=>"Succeeded"
+              }
+          }
         end
       end
     end

data/lib/fog/azurerm/requests/compute/deallocate_virtual_machine.rb

@@ -7,9 +7,9 @@ module Fog
           Fog::Logger.debug "Deallocating Virtual Machine #{name} in Resource Group #{resource_group}."
           begin
             promise = @compute_mgmt_client.virtual_machines.deallocate(resource_group, name)
-            result = promise.value!
+            promise.value!
             Fog::Logger.debug "Virtual Machine #{name} Deallocated Successfully."
-            result
+            true
           rescue  MsRestAzure::AzureOperationError => e
             msg = "Error Deallocating Virtual Machine '#{name}' in Resource Group '#{resource_group}'. #{e.body['error']['message']}"
             raise msg
@@ -19,6 +19,8 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def deallocate_virtual_machine(resource_group, name)
+          Fog::Logger.debug "Virtual Machine #{name} from Resource group #{resource_group} Deallocated successfully."
+          return true
         end
       end
     end

data/lib/fog/azurerm/requests/compute/delete_availability_set.rb

@@ -7,9 +7,9 @@ module Fog
           begin
             Fog::Logger.debug "Deleting Availability Set: #{name}."
             promise = @compute_mgmt_client.availability_sets.delete(resource_group, name)
-            result = promise.value!
+            promise.value!
             Fog::Logger.debug "Availability Set #{name} deleted successfully."
-            result
+            true
           rescue MsRestAzure::AzureOperationError => e
             msg = "Exception deleting Availability Set #{name} in Resourse Group #{resource_group}. #{e.body['error']['message']}"
             raise msg
@@ -19,6 +19,8 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def delete_availability_set(resource_group, name)
+          Fog::Logger.debug "Availability Set #{name} from Resource group #{resource_group} deleted successfully."
+          return true
         end
       end
     end

data/lib/fog/azurerm/requests/compute/delete_virtual_machine.rb

@@ -7,9 +7,9 @@ module Fog
           Fog::Logger.debug "Deleting Virtual Machine #{name} from Resource Group #{resource_group}."
           begin
             promise = @compute_mgmt_client.virtual_machines.delete(resource_group, name)
-            result = promise.value!
+            promise.value!
             Fog::Logger.debug "Virtual Machine #{name} Deleted Successfully."
-            result
+            true
           rescue  MsRestAzure::AzureOperationError => e
             msg = "Error Deleting Virtual Machine '#{name}' from Resource Group '#{resource_group}'. #{e.body['error']['message']}"
             raise msg
@@ -19,6 +19,8 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def delete_virtual_machine(resource_group, name)
+          Fog::Logger.debug "Virtual Machine #{name} from Resource group #{resource_group} deleted successfully."
+          return true
         end
       end
     end

data/lib/fog/azurerm/requests/compute/generalize_virtual_machine.rb

@@ -7,9 +7,9 @@ module Fog
           Fog::Logger.debug "Generalizing Virtual Machine #{name} in Resource Group #{resource_group}."
           begin
             promise = @compute_mgmt_client.virtual_machines.generalize(resource_group, name)
-            result = promise.value!
+            promise.value!
             Fog::Logger.debug "Virtual Machine #{name} Generalized Successfully."
-            result
+            true
           rescue  MsRestAzure::AzureOperationError => e
             msg = "Error Generalizing Virtual Machine '#{name}' in Resource Group '#{resource_group}'. #{e.body['error']['message']}"
             raise msg
@@ -19,6 +19,8 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def generalize_virtual_machine(resource_group, name)
+          Fog::Logger.debug "Virtual Machine #{name} from Resource group #{resource_group} Generalized successfully."
+          return true
         end
       end
     end

data/lib/fog/azurerm/requests/compute/get_virtual_machine.rb

@@ -7,7 +7,7 @@ module Fog
           begin
             promise = @compute_mgmt_client.virtual_machines.get(resource_group, name)
             response = promise.value!
-            response.body
+            Azure::ARM::Compute::Models::VirtualMachine.serialize_object(response.body)
           rescue MsRestAzure::AzureOperationError => e
             msg = "Exception getting Virtual Machine #{name} from Resource Group '#{resource_group}'. #{e.body['error']['message']}"
             raise msg
@@ -17,6 +17,62 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def get_virtual_machine(resource_group, name)
+          {
+              "location"=>"westus",
+              "id"=>"/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Compute/virtualMachines/#{name}",
+              "name"=>name,
+              "type"=>"Microsoft.Compute/virtualMachines",
+              "properties"=>
+                  {
+                      "hardwareProfile"=>
+                          {
+                              "vmSize"=>"Basic_A0"
+                          },
+                      "storageProfile"=>
+                          {
+                              "imageReference"=>
+                                  {
+                                      "publisher"=>"Canonical",
+                                      "offer"=>"UbuntuServer",
+                                      "sku"=>"14.04.2-LTS",
+                                      "version"=>"latest"
+                                  },
+                              "osDisk"=>
+                                  {
+                                      "name"=>"#{name}_os_disk",
+                                      "vhd"=>
+                                          {
+                                              "uri"=>"http://fogtestsafirst.blob.core.windows.net/vhds/testVM_os_disk.vhd"
+                                          },
+                                      "createOption"=>"FromImage",
+                                      "osType"=>"Linux",
+                                      "caching"=>"ReadWrite"
+                                  },
+                              "dataDisks"=>[]
+                          },
+                      "osProfile"=>
+                          {
+                              "computerName"=>name,
+                              "adminUsername"=>"testfog",
+                              "linuxConfiguration"=>
+                                  {
+                                      "disablePasswordAuthentication"=>false
+                                  },
+                              "secrets"=>[]
+                          },
+                      "networkProfile"=>
+                          {
+                              "networkInterfaces"=>
+                                  [
+                                      {
+                                          "id"=>"/subscriptions/########-####-####-####-############/resourceGroups/#{resource_group}/providers/Microsoft.Network/networkInterfaces/testNIC"
+                                      }
+                                  ]
+                          },
+                      "provisioningState"=>"Succeeded"
+                  }
+          }
+
         end
       end
     end

data/lib/fog/azurerm/requests/compute/list_availability_sets.rb

@@ -7,7 +7,7 @@ module Fog
           begin
             promise = @compute_mgmt_client.availability_sets.list(resource_group)
             response = promise.value!
-            response.body.value
+            Azure::ARM::Compute::Models::AvailabilitySetListResult.serialize_object(response.body)['value']
           rescue MsRestAzure::AzureOperationError => e
             msg = "Exception listing availability sets in Resource Group #{resource_group}. #{e.body['error']['message']}"
             raise msg
@@ -17,6 +17,21 @@ module Fog
       # This class provides the mock implementation for unit tests.
       class Mock
         def list_availability_sets(resource_group)
+          [
+              {
+                "id"=>"/subscriptions/{subscription-id}/resourceGroups/#{resource_group}/providers/Microsoft.Compute/availabilitySets/test_availability_set",
+                "name"=>"test_availability_set",
+                "type"=>"Microsoft.Compute/availabilitySets",
+                "location"=>"westus",
+                "tags"=> {},
+                "properties"=>
+                  {
+                    "platformUpdateDomainCount"=>5,
+                    "platformFaultDomainCount"=>3,
+                    "virtualMachines"=>[]
+                  }
+              }
+          ]
         end
       end
     end