fog-azure-rm 0.1.0 → 0.1.1

data/lib/fog/azurerm/traffic_manager.rb

@@ -35,7 +35,7 @@ module Fog
           end
 
           credentials = Fog::Credentials::AzureRM.get_credentials(options[:tenant_id], options[:client_id], options[:client_secret])
-          @traffic_mgmt_client = ::Azure::ARM::TrafficManager::TrafficManagerManagementClient.new(credentials)
+          @traffic_mgmt_client = ::Azure::ARM::TrafficManager::TrafficManagerManagementClient.new(credentials, resource_manager_endpoint_url)
           @traffic_mgmt_client.subscription_id = options[:subscription_id]
         end
       end

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

@@ -10,7 +10,7 @@ end
 
 # Pick Virtual Machine name from Virtual Machine Extension Id(String)
 def get_virtual_machine_from_id(vme_id)
-  vme_id.split('/')[8]
+  vme_id.split('/')[VM_NAME_POSITION]
 end
 
 # Extract Endpoint type from (String)
@@ -53,9 +53,9 @@ end
 
 def raise_azure_exception(exception, msg)
   message = if exception.respond_to? 'body'
-              "Exception in #{msg} #{exception.body['error']['message'] unless exception.body['error']['message'].nil?} Type: #{exception.class} \n "
+              "Exception in #{msg} #{exception.body['error']['message'] unless exception.body['error']['message'].nil?} Type: #{exception.class}\n#{exception.backtrace.join("\n")}"
             else
-              exception.inspect
+              "#{exception.inspect}\n#{exception.backtrace.join("\n")}"
             end
   Fog::Logger.debug exception.backtrace
   raise message
@@ -81,3 +81,70 @@ end
 def random_string(length)
   (0...length).map { ('a'..'z').to_a[rand(26)] }.join
 end
+
+def get_blob_link(storage_account_name)
+  "http://#{storage_account_name}.blob.core.windows.net"
+end
+
+def active_directory_service_settings
+  case CLOUD
+  when 'AzureChina'
+    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_china_settings
+  when 'AzureGermanCloud'
+    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_german_settings
+  when 'AzureUSGovernment'
+    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_us_government_settings
+  else
+    MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
+  end
+end
+
+def resource_manager_endpoint_url
+  case CLOUD
+  when 'AzureChina'
+    AZURE_CHINA_RM_ENDPOINT_URL
+  when 'AzureGermanCloud'
+    GERMAN_CLOUD_RM_ENDPOINT_URL
+  when 'AzureUSGovernment'
+    US_GOVERNMENT_RM_ENDPOINT_URL
+  else
+    AZURE_GLOBAL_RM_ENDPOINT_URL
+  end
+end
+
+def current_time
+  time = Time.now.to_f.to_s
+  time.split(/\W+/).join
+end
+
+# Parse storage blob/container to a hash
+def parse_storage_object(object)
+  data = {}
+  if object.is_a? Hash
+    object.each do |k, v|
+      if k == 'properties'
+        v.each do |j, l|
+          data[j] = l
+        end
+      else
+        data[k] = v
+      end
+    end
+  else
+    object.instance_variables.each do |p|
+      kname = p.to_s.delete('@')
+      if kname == 'properties'
+        properties = object.instance_variable_get(p)
+        properties.each do |k, v|
+          data[k.to_s] = v
+        end
+      else
+        data[kname] = object.instance_variable_get(p)
+      end
+    end
+  end
+
+  data['last_modified'] = Time.parse(data['last_modified'])
+  data['etag'].delete!('"')
+  data
+end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

data/rake-script.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
-if [ $TRAVIS_PULL_REQUEST != "true"]
+if [ $TRAVIS_PULL_REQUEST != "true" ]
 then
   rake cc_coverage
-  rake integration_tests
+  export CODECLIMATE_REPO_TOKEN="b1401494baa004d90402414cb33a7fc6420fd3693e60c677a120ddefd7d84cfd"
+  codeclimate-test-reporter --directory /home/travis/build/fog/fog-azure-rm/coverage
 else
   rake cc_coverage
+  export CODECLIMATE_REPO_TOKEN="b1401494baa004d90402414cb33a7fc6420fd3693e60c677a120ddefd7d84cfd"
+  codeclimate-test-reporter --directory /home/travis/build/fog/fog-azure-rm/coverage
 fi

data/test/api_stub/models/application_gateway/gateway.rb

@@ -129,7 +129,7 @@ module ApiStub
               }
             }'
           gateway_mapper = Azure::ARM::Network::Models::ApplicationGateway.mapper
-          gateway_client.deserialize(gateway_mapper, JSON.load(gateway), 'result.body')
+          gateway_client.deserialize(gateway_mapper, Fog::JSON.decode(gateway), 'result.body')
         end
 
         def self.ssl_certifcate

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

@@ -121,7 +121,7 @@ module ApiStub
             ]
           }'
           vm_mapper = Azure::ARM::Compute::Models::VirtualMachineSizeListResult.mapper
-          compute_client.deserialize(vm_mapper, JSON.load(body), 'result.body').value
+          compute_client.deserialize(vm_mapper, Fog::JSON.decode(body), 'result.body').value
         end
 
         def self.attach_data_disk_response(compute_client)

data/test/api_stub/models/dns/record_set.rb

@@ -27,7 +27,7 @@ module ApiStub
               }
           }'
           record_set_mapper = Azure::ARM::Dns::Models::RecordSet.mapper
-          dns_client.deserialize(record_set_mapper, JSON.load(record_set), 'result.body')
+          dns_client.deserialize(record_set_mapper, Fog::JSON.decode(record_set), 'result.body')
         end
 
         def self.response_for_cname(dns_client)
@@ -49,7 +49,7 @@ module ApiStub
             }
           }'
           cname_record_mapper = Azure::ARM::Dns::Models::RecordSet.mapper
-          dns_client.deserialize(cname_record_mapper, JSON.load(cname_record), 'result.body')
+          dns_client.deserialize(cname_record_mapper, Fog::JSON.decode(cname_record), 'result.body')
         end
       end
     end

data/test/api_stub/models/dns/zone.rb

@@ -21,7 +21,7 @@ module ApiStub
             "resource_group": "fog-test-rg"
           }'
           zone_mapper = Azure::ARM::Dns::Models::Zone.mapper
-          dns_client.deserialize(zone_mapper, JSON.load(zone), 'result.body')
+          dns_client.deserialize(zone_mapper, Fog::JSON.decode(zone), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/express_route_circuit.rb

@@ -39,7 +39,7 @@ module ApiStub
             }
           }'
           express_route_circuit_mapper = Azure::ARM::Network::Models::ExpressRouteCircuit.mapper
-          network_client.deserialize(express_route_circuit_mapper, JSON.load(circuit), 'result.body')
+          network_client.deserialize(express_route_circuit_mapper, Fog::JSON.decode(circuit), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/express_route_circuit_authorization.rb

@@ -14,7 +14,7 @@ module ApiStub
           }'
 
           express_route_circuit_authorization_mapper = Azure::ARM::Network::Models::ExpressRouteCircuitAuthorization.mapper
-          network_client.deserialize(express_route_circuit_authorization_mapper, JSON.load(authorization), 'result.body')
+          network_client.deserialize(express_route_circuit_authorization_mapper, Fog::JSON.decode(authorization), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/express_route_circuit_peering.rb

@@ -25,7 +25,7 @@ module ApiStub
                           }
                   }'
           express_route_circuit_peering_mapper = Azure::ARM::Network::Models::ExpressRouteCircuitPeering.mapper
-          network_client.deserialize(express_route_circuit_peering_mapper, JSON.load(peering), 'result.body')
+          network_client.deserialize(express_route_circuit_peering_mapper, Fog::JSON.decode(peering), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/express_route_service_provider.rb

@@ -21,7 +21,7 @@ module ApiStub
               }
             ]}'
           express_route_servcie_provider_mapper = Azure::ARM::Network::Models::ExpressRouteServiceProviderListResult.mapper
-          network_client.deserialize(express_route_servcie_provider_mapper, JSON.load(service_provider), 'result.body').value
+          network_client.deserialize(express_route_servcie_provider_mapper, Fog::JSON.decode(service_provider), 'result.body').value
         end
       end
     end

data/test/api_stub/models/network/load_balancer.rb

@@ -146,7 +146,7 @@ module ApiStub
 						}
           }'
           load_balancer_mapper = Azure::ARM::Network::Models::LoadBalancer.mapper
-          network_client.deserialize(load_balancer_mapper, JSON.load(load_balancer), 'result.body')
+          network_client.deserialize(load_balancer_mapper, Fog::JSON.decode(load_balancer), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/network_interface.rb

@@ -64,7 +64,7 @@ module ApiStub
              }
           }'
           network_interface_mapper = Azure::ARM::Network::Models::NetworkInterface.mapper
-          network_client.deserialize(network_interface_mapper, JSON.load(nic), 'result.body')
+          network_client.deserialize(network_interface_mapper, Fog::JSON.decode(nic), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/network_security_group.rb

@@ -69,7 +69,7 @@ module ApiStub
              }
           }'
           result_mapper = Azure::ARM::Network::Models::NetworkSecurityGroup.mapper
-          network_client.deserialize(result_mapper, JSON.load(nsg), 'result.body')
+          network_client.deserialize(result_mapper, Fog::JSON.decode(nsg), 'result.body')
         end
 
         def self.security_rules_array

data/test/api_stub/models/network/network_security_rule.rb

@@ -22,7 +22,7 @@ module ApiStub
               }
           }'
           nsr_mapper = Azure::ARM::Network::Models::SecurityRule.mapper
-          network_client.deserialize(nsr_mapper, JSON.load(nsr), 'result.body')
+          network_client.deserialize(nsr_mapper, Fog::JSON.decode(nsr), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/public_ip.rb

@@ -28,7 +28,7 @@ module ApiStub
              }
           }'
           public_ip_mapper = Azure::ARM::Network::Models::PublicIPAddress.mapper
-          network_client.deserialize(public_ip_mapper, JSON.load(public_ip), 'result.body')
+          network_client.deserialize(public_ip_mapper, Fog::JSON.decode(public_ip), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/subnet.rb

@@ -28,7 +28,7 @@ module ApiStub
              }
           }'
           subnet_mapper = Azure::ARM::Network::Models::Subnet.mapper
-          network_client.deserialize(subnet_mapper, JSON.load(subnet), 'result.body')
+          network_client.deserialize(subnet_mapper, Fog::JSON.decode(subnet), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/virtual_network.rb

@@ -54,7 +54,7 @@ module ApiStub
              }
           }'
           vnet_mapper = Azure::ARM::Network::Models::VirtualNetwork.mapper
-          network_client.deserialize(vnet_mapper, JSON.load(vnet), 'result.body')
+          network_client.deserialize(vnet_mapper, Fog::JSON.decode(vnet), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/virtual_network_gateway.rb

@@ -18,7 +18,7 @@ module ApiStub
             }
           }'
           gateway_mapper = Azure::ARM::Network::Models::VirtualNetworkGateway.mapper
-          network_client.deserialize(gateway_mapper, JSON.load(network_gateway), 'result.body')
+          network_client.deserialize(gateway_mapper, Fog::JSON.decode(network_gateway), 'result.body')
         end
       end
     end

data/test/api_stub/models/network/virtual_network_gateway_connection.rb

@@ -23,7 +23,7 @@ module ApiStub
             }
           }'
           connection_mapper = Azure::ARM::Network::Models::VirtualNetworkGatewayConnection.mapper
-          network_client.deserialize(connection_mapper, JSON.load(gateway_connection), 'result.body')
+          network_client.deserialize(connection_mapper, Fog::JSON.decode(gateway_connection), 'result.body')
         end
       end
     end

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

@@ -16,7 +16,7 @@ module ApiStub
                 "name": "free"
             }
           }'
-          JSON.load(body)
+          Fog::JSON.decode(body)
         end
 
         def self.list_resources_response(client)
@@ -35,7 +35,7 @@ module ApiStub
             }]
           }'
           result_mapper = Azure::ARM::Resources::Models::ResourceListResult.mapper
-          client.deserialize(result_mapper, JSON.load(resources), 'result.body').value
+          client.deserialize(result_mapper, Fog::JSON.decode(resources), 'result.body').value
         end
       end
     end

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

@@ -16,7 +16,7 @@ module ApiStub
             }
           }'
           result_mapper = Azure::ARM::Resources::Models::ResourceGroup.mapper
-          client.deserialize(result_mapper, JSON.load(resource_group), 'result.body')
+          client.deserialize(result_mapper, Fog::JSON.decode(resource_group), 'result.body')
         end
       end
     end

data/test/api_stub/models/storage/directory.rb

@@ -3,89 +3,175 @@ module ApiStub
     module Storage
       # Mock class for Data Disk Model
       class Directory
-        def self.test_get_container_metadata
+        def self.container
           {
-            'container-name' => 'Test-container',
-            'created-by' => 'User',
-            'source-machine' => 'Test-machine',
-            'category' => 'guidance',
-            'doctype' => 'textDocuments'
+            'name' => 'test_container',
+            'public_access_level' => nil,
+            'metadata' => {},
+            'properties' => {
+              'last_modified' => 'Mon, 04 Jul 2016 02:50:20 GMT',
+              'etag' => '"0x8D3A3B5F017F52D"',
+              'lease_status' => 'unlocked',
+              'lease_state' => 'available'
+            }
           }
         end
 
-        def self.create_container
-          {
-            'name' => 'testcontainer1',
-            'properties' =>
-              {
-                'last_modified' => 'Mon, 04 Jul 2016 02:50:20 GMT',
-                'etag' => '0x8D3A3B5F017F52D',
-                'lease_status' => 'unlocked',
-                'lease_state' => 'available'
-              },
-            'public_access_level' => nil,
-            'metadata' => {}
-          }
+        def self.container_acl
+          ['container', {}]
         end
 
-        def self.list_containers
+        def self.container_https_url
+          'https://sa.blob.core.windows.net/test_container?comp=list&restype=container'
+        end
+
+        def self.container_list
           [
             {
-              'name' => 'testcontainer1',
-              'properties' =>
-                {
-                  'last_modified' => 'Mon, 04 Jul 2016 02:50:20 GMT',
-                  'etag' => '0x8D3A3B5F017F52D',
-                  'lease_status' => 'unlocked',
-                  'lease_state' => 'available'
-                },
-              'metadata' => {}
+              'name' => 'test_container1',
+              'metadata' => {},
+              'properties' => {
+                'last_modified' => 'Mon, 04 Jul 2016 02:50:20 GMT',
+                'etag' => '"0x8D3A3B5F017F52D"',
+                'lease_status' => 'unlocked',
+                'lease_state' => 'available'
+              }
             },
             {
-              'name' => 'testcontainer2',
-              'properties' =>
-                {
-                  'last_modified' => 'Tue, 04 Aug 2015 06:01:08 GMT',
-                  'etag' => '0x8D29C92176C8352',
-                  'lease_status' => 'unlocked',
-                  'lease_state' => 'available'
-                },
-              'metadata' => {}
+              'name' => 'test_container2',
+              'metadata' => {},
+              'properties' => {
+                'last_modified' => 'Tue, 04 Aug 2015 06:01:08 GMT',
+                'etag' => '"0x8D29C92176C8352"',
+                'lease_status' => 'unlocked',
+                'lease_state' => 'available'
+              }
             },
             {
-              'name' => 'testcontainer3',
-              'properties' =>
-                {
-                  'last_modified' => 'Tue, 01 Sep 2015 05:15:36 GMT',
-                  'etag' => '0x8D2B28C5EB36458',
-                  'lease_status' => 'unlocked',
-                  'lease_state' => 'available'
-                },
-              'metadata' => {}
+              'name' => 'test_container3',
+              'metadata' => {},
+              'properties' => {
+                'last_modified' => 'Tue, 01 Sep 2015 05:15:36 GMT',
+                'etag' => '"0x8D2B28C5EB36458"',
+                'lease_status' => 'unlocked',
+                'lease_state' => 'available'
+              }
             }
           ]
         end
 
-        def self.get_container_properties
+        def self.blob_list
           {
-            'name' => 'testcontainer1',
-            'properties' =>
+            next_marker: 'marker',
+            blobs:
+            [
               {
-                'last_modified' => 'Mon, 04 Jul 2016 02:50:20 GMT',
-                'etag' => '0x8D3A3B5F017F52D',
-                'lease_status' => 'unlocked',
-                'lease_state' => 'available'
+                'name' => 'test_blob1',
+                'metadata' => {},
+                'properties' => {
+                  'last_modified' => 'Mon, 04 Jul 2016 02:50:20 GMT',
+                  'etag' => '"0x8D3A3B5F017F52D"',
+                  'lease_status' => 'unlocked',
+                  'lease_state' => 'available',
+                  'content_length' => 4_194_304,
+                  'content_type' => 'application/octet-stream',
+                  'content_encoding' => nil,
+                  'content_language' => nil,
+                  'content_disposition' => nil,
+                  'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                  'cache_control' => nil,
+                  'sequence_number' => 0,
+                  'blob_type' => 'PageBlob',
+                  'copy_id' => '095adc3b-e277-4c3d-97e0-0abca881f60c',
+                  'copy_status' => 'success',
+                  'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A50.3256874Z',
+                  'copy_progress' => '4194304/4194304',
+                  'copy_completion_time' => 'Thu, 04 Feb 2016 08:35:52 GMT',
+                  'copy_status_description' => nil,
+                  'accept_ranges' => 0
+                }
               },
-            'metadata' => {}
+              {
+                'name' => 'test_blob2',
+                'metadata' => {},
+                'properties' => {
+                  'last_modified' => 'Tue, 04 Aug 2015 06:02:08 GMT',
+                  'etag' => '"0x8D29C92173526C8"',
+                  'lease_status' => 'unlocked',
+                  'lease_state' => 'available',
+                  'content_length' => 4_194_304,
+                  'content_type' => 'application/octet-stream',
+                  'content_encoding' => nil,
+                  'content_language' => nil,
+                  'content_disposition' => nil,
+                  'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                  'cache_control' => nil,
+                  'sequence_number' => 0,
+                  'blob_type' => 'PageBlob',
+                  'copy_id' => '0abcdc3b-4c3d-e277-97e0-0abca881f60c',
+                  'copy_status' => 'success',
+                  'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A55.3157696Z',
+                  'copy_progress' => '4194304/4194304',
+                  'copy_completion_time' => 'Thu, 04 Feb 2016 08:40:52 GMT',
+                  'copy_status_description' => nil,
+                  'accept_ranges' => 0
+                }
+              },
+              {
+                'name' => 'test_blob3',
+                'metadata' => {},
+                'properties' => {
+                  'last_modified' => 'Tue, 04 Aug 2015 06:02:08 GMT',
+                  'etag' => '"0x8D29C92173526C8"',
+                  'lease_status' => 'unlocked',
+                  'lease_state' => 'available',
+                  'content_length' => 4_194_304,
+                  'content_type' => 'application/octet-stream',
+                  'content_encoding' => nil,
+                  'content_language' => nil,
+                  'content_disposition' => nil,
+                  'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                  'cache_control' => nil,
+                  'sequence_number' => 0,
+                  'blob_type' => 'PageBlob',
+                  'copy_id' => '0abcdc3b-4c3d-e277-97e0-0abca881f60c',
+                  'copy_status' => 'success',
+                  'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A55.3157696Z',
+                  'copy_progress' => '4194304/4194304',
+                  'copy_completion_time' => 'Thu, 04 Feb 2016 08:40:52 GMT',
+                  'copy_status_description' => nil,
+                  'accept_ranges' => 0
+                }
+              },
+              {
+                'name' => 'test_blob4',
+                'metadata' => {},
+                'properties' => {
+                  'last_modified' => 'Tue, 04 Aug 2015 06:02:08 GMT',
+                  'etag' => '"0x8D29C92173526C8"',
+                  'lease_status' => 'unlocked',
+                  'lease_state' => 'available',
+                  'content_length' => 4_194_304,
+                  'content_type' => 'application/octet-stream',
+                  'content_encoding' => nil,
+                  'content_language' => nil,
+                  'content_disposition' => nil,
+                  'content_md5' => 'tXAohIyxuu/t94Lp/ujeRw==',
+                  'cache_control' => nil,
+                  'sequence_number' => 0,
+                  'blob_type' => 'PageBlob',
+                  'copy_id' => '0abcdc3b-4c3d-e277-97e0-0abca881f60c',
+                  'copy_status' => 'success',
+                  'copy_source' => 'https://testaccount.blob.core.windows.net/test_container/test_blob?snapshot=2016-02-04T08%3A35%3A55.3157696Z',
+                  'copy_progress' => '4194304/4194304',
+                  'copy_completion_time' => 'Thu, 04 Feb 2016 08:40:52 GMT',
+                  'copy_status_description' => nil,
+                  'accept_ranges' => 0
+                }
+              }
+            ]
           }
         end
-
-        def self.get_container_access_control_list
-          [{
-            'name' => 'testcontainer1',
-            'public_access_level' => 'blob'
-          }, {}]
-        end
       end
     end
   end