fog-azure-rm 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 731aaa338eaa0b86ea9c2b9e2e838e16411d03a9
-  data.tar.gz: 6915b60d50f07eab248c59e24a67b85320344cc1
+  metadata.gz: 9b24d2c21a6e6802af2ca763b1230cb7a7d75acc
+  data.tar.gz: 1a176bf88ef73639cf5c4cceafdebfb13f676d28
 SHA512:
-  metadata.gz: 7a16c8f7733e70238b55f8238a52d6dafccb988cb222fc7d96f9bea6ba90608689c7aa1cd972c737a600ff8b85c68870a845f25f89c8dd2a824e8275ceaf8afc
-  data.tar.gz: 4eab5acba5b78ad74eed791a1573175c9ff37a49a0688933b9a47a75290ae54fbb01fd2e64657a68faf39b52bcd36e6a1ac4e9e5f4d462be4ed7ac551fa45c00
+  metadata.gz: 57b1cd6b6c20875fcd62db652f45818741b6fb37bd855250881ea261a50b401900dea6851384565642fa9cb492030aac6f4e3708135fe03bd69525c9bee6a3de
+  data.tar.gz: e730e48874f042e56027233ee84167ae48cdb38fbc96c02a49ecf9aaddee839bbdcf4953fb88b9a8087d80cb6a3262d1bd8296a403ec3b237a8592c8be39833d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.2.6
+
+**Fixed:**
+- Compute Service - storage_account_name attribute issue in server model
+- Network Service - Attaching NSG issue while creating NIC
+
+**Removed:**
+- Dependency on nokogiri
+
 ## 0.2.5
 
 **Fixed:**

data/fog-azure-rm.gemspec

@@ -35,5 +35,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'azure_mgmt_key_vault', '~> 0.8.0'
   spec.add_dependency 'azure-storage', '~> 0.11.5.preview'
   spec.add_dependency 'vhd', '0.0.4'
-  spec.add_dependency 'nokogiri', '~> 1.6.0'
 end

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

@@ -41,6 +41,7 @@ module Fog
           unless vm.storage_profile.nil?
             hash['os_disk_name'] = vm.storage_profile.os_disk.name
             hash['os_disk_vhd_uri'] = vm.storage_profile.os_disk.vhd.uri
+            hash['storage_account_name'] = hash['os_disk_vhd_uri'].split('/')[2].split('.')[0]
             hash['os_disk_caching'] = vm.storage_profile.os_disk.caching
             unless vm.storage_profile.image_reference.nil?
               hash['publisher'] = vm.storage_profile.image_reference.publisher

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

@@ -62,14 +62,14 @@ module Fog
           requires :subnet_id
           requires :ip_configuration_name
           requires :private_ip_allocation_method
-          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, ip_configuration_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_configuration_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
           merge_attributes(Fog::Network::AzureRM::NetworkInterface.parse(nic))
         end
 
         def update(updated_attributes = {})
           validate_update_attributes!(updated_attributes)
           merge_attributes(updated_attributes)
-          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, ip_configuration_name, private_ip_allocation_method, private_ip_address)
+          nic = service.create_or_update_network_interface(resource_group, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_configuration_name, private_ip_allocation_method, private_ip_address)
           merge_attributes(Fog::Network::AzureRM::NetworkInterface.parse(nic))
         end
 

data/lib/fog/azurerm/requests/network/create_or_update_network_interface.rb

@@ -4,10 +4,10 @@ module Fog
     class AzureRM
       # Real class for Network Request
       class Real
-        def create_or_update_network_interface(resource_group_name, name, location, subnet_id, public_ip_address_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+        def create_or_update_network_interface(resource_group_name, name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
           msg = "Creating/Updating Network Interface Card: #{name}"
           Fog::Logger.debug msg
-          network_interface = get_network_interface_object(name, location, subnet_id, public_ip_address_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
+          network_interface = get_network_interface_object(name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
           begin
             network_interface_obj = @network_client.network_interfaces.create_or_update(resource_group_name, name, network_interface)
           rescue MsRestAzure::AzureOperationError => e
@@ -19,10 +19,7 @@ module Fog
 
         private
 
-        def get_network_interface_object(name, location, subnet_id, public_ip_address_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
-          subnet = Azure::ARM::Network::Models::Subnet.new
-          subnet.id = subnet_id
-
+        def get_network_interface_object(name, location, subnet_id, public_ip_address_id, network_security_group_id, ip_config_name, private_ip_allocation_method, private_ip_address, load_balancer_backend_address_pools_ids, load_balancer_inbound_nat_rules_ids)
           if public_ip_address_id
             public_ipaddress = Azure::ARM::Network::Models::PublicIPAddress.new
             public_ipaddress.id = public_ip_address_id
@@ -33,16 +30,20 @@ module Fog
           ip_configs.private_ipallocation_method = private_ip_allocation_method
           ip_configs.private_ipaddress = private_ip_address
           ip_configs.public_ipaddress = public_ipaddress unless public_ip_address_id.nil?
-          ip_configs.subnet = subnet
 
+          if subnet_id
+            subnet = Azure::ARM::Network::Models::Subnet.new
+            subnet.id = subnet_id
+            ip_configs.subnet = subnet
+          end
 
           if load_balancer_backend_address_pools_ids
             ip_configs.load_balancer_backend_address_pools = []
-          load_balancer_backend_address_pools_ids.each do |load_balancer_backend_address_pools_id|
+            load_balancer_backend_address_pools_ids.each do |load_balancer_backend_address_pools_id|
               backend_pool = Azure::ARM::Network::Models::BackendAddressPool.new
               backend_pool.id = load_balancer_backend_address_pools_id
               ip_configs.load_balancer_backend_address_pools.push(backend_pool)
-          end
+            end
           end
 
           if load_balancer_inbound_nat_rules_ids
@@ -59,6 +60,12 @@ module Fog
           network_interface.location = location
           network_interface.ip_configurations = [ip_configs]
 
+          if network_security_group_id
+            network_security_group = Azure::ARM::Network::Models::NetworkSecurityGroup.new
+            network_security_group.id = network_security_group_id
+            network_interface.network_security_group = network_security_group
+          end
+
           network_interface
         end
       end

data/lib/fog/azurerm/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AzureRM
-    VERSION = '0.2.5'.freeze
+    VERSION = '0.2.6'.freeze
   end
 end

data/test/integration/network_interface.rb

@@ -67,7 +67,7 @@ begin
     public_ip_allocation_method: 'Dynamic'
   )
 
-  network.network_security_groups.create(
+  nsg = network.network_security_groups.create(
     name: 'test_nsg',
     resource_group: 'TestRG-NI',
     location: LOCATION,
@@ -102,6 +102,7 @@ begin
     name: 'NetInt',
     resource_group: 'TestRG-NI',
     location: LOCATION,
+    network_security_group_id: nsg.id,
     subnet_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/TestRG-NI/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/mysubnet",
     public_ip_address_id: "/subscriptions/#{azure_credentials['subscription_id']}/resourceGroups/TestRG-NI/providers/Microsoft.Network/publicIPAddresses/mypubip",
     ip_configuration_name: 'testIpConfiguration',

data/test/requests/network/test_create_network_interface.rb

@@ -11,14 +11,14 @@ class TestCreateNetworkInterface < Minitest::Test
   def test_create_network_interface_success
     mocked_response = ApiStub::Requests::Network::NetworkInterface.create_network_interface_response(@network_client)
     @network_interfaces.stub :create_or_update, mocked_response do
-      assert_equal @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', 'fog-test-ip-address-id', 'fog-test-ip-configuration', 'Dynamic', '10.0.0.8', ['id-1', 'id-2'], ['id-1', 'id-2']), mocked_response
+      assert_equal @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', 'fog-test-ip-address-id', 'fog-test-nsg-id', 'fog-test-ip-configuration', 'Dynamic', '10.0.0.8', ['id-1', 'id-2'], ['id-1', 'id-2']), mocked_response
     end
   end
 
   def test_create_network_interface_without_public_ip_success
     mocked_response = ApiStub::Requests::Network::NetworkInterface.create_network_interface_response(@network_client)
     @network_interfaces.stub :create_or_update, mocked_response do
-      assert_equal @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', nil, 'fog-test-ip-configuration', 'Dynamic', '10.0.0.8', ['id-1', 'id-2'], ['id-1', 'id-2']), mocked_response
+      assert_equal @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', nil, 'fog-test-nsg-id', 'fog-test-ip-configuration', 'Dynamic', '10.0.0.8', ['id-1', 'id-2'], ['id-1', 'id-2']), mocked_response
     end
   end
 
@@ -26,7 +26,7 @@ class TestCreateNetworkInterface < Minitest::Test
     response = ApiStub::Requests::Network::NetworkInterface.create_network_interface_response(@network_client)
     @network_interfaces.stub :create_or_update, response do
       assert_raises ArgumentError do
-        @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', 'fog-test-ip-address-id', 'fog-test-ip-configuration', ['id-1', 'id-2'], ['id-1', 'id-2'])
+        @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', 'fog-test-ip-address-id', 'fog-test-nsg-id', 'fog-test-ip-configuration', ['id-1', 'id-2'], ['id-1', 'id-2'])
       end
     end
   end
@@ -35,7 +35,7 @@ class TestCreateNetworkInterface < Minitest::Test
     response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
     @network_interfaces.stub :create_or_update, response do
       assert_raises RuntimeError do
-        @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', 'fog-test-ip-address-id', 'fog-test-ip-configuration', 'Dynamic', '10.0.0.8', ['id-1', 'id-2'], ['id-1', 'id-2'])
+        @service.create_or_update_network_interface('fog-test-rg', 'fog-test-network-interface', 'West US', 'fog-test-subnet-id', 'fog-test-ip-address-id', 'fog-test-nsg-id', 'fog-test-ip-configuration', 'Dynamic', '10.0.0.8', ['id-1', 'id-2'], ['id-1', 'id-2'])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-azure-rm
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Shaffan Chaudhry
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -254,20 +254,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 description: |-
   This library can be used as a module for 'fog' or as standalone provider
                           to use the Azure Resource Manager cloud services in applications..