fog-azure-rm 0.0.4 → 0.0.5

data/test/requests/network/test_remove_address_prefixes_from_virtual_network.rb

@@ -4,41 +4,25 @@ require File.expand_path '../../test_helper', __dir__
 class TestRemoveddressPrefixesInVirtualNetwork < Minitest::Test
   def setup
     @service = Fog::Network::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@network_client)
-    @virtual_networks = client.virtual_networks
+    @network_client = @service.instance_variable_get(:@network_client)
+    @virtual_networks = @network_client.virtual_networks
   end
 
   def test_remove_address_prefixes_in_virtual_network_success
-    promise_get = Concurrent::Promise.execute do
-    end
-    promise_create = Concurrent::Promise.execute do
-    end
-
-    mocked_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response
-    expected_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response
-    expected_response = Azure::ARM::Network::Models::VirtualNetwork.serialize_object(expected_response.body)
-    expected_response['properties']['addressSpace']['addressPrefixes'].delete('10.1.0.0/16')
-
-    promise_get.stub :value!, mocked_response do
-      promise_create.stub :value!, mocked_response do
-        @virtual_networks.stub :get, promise_get do
-          @virtual_networks.stub :create_or_update, promise_create do
-            assert_equal @service.remove_address_prefixes_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.0/16']), expected_response
-          end
-        end
+    mocked_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response(@network_client)
+    mocked_response.address_space.address_prefixes.delete('10.1.0.0/16')
+    @virtual_networks.stub :get, mocked_response do
+      @virtual_networks.stub :create_or_update, mocked_response do
+        assert_equal @service.remove_address_prefixes_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.0/16']), mocked_response
       end
     end
   end
 
   def test_remove_address_prefixes_in_virtual_network_failure
-    promise = Concurrent::Promise.execute do
-    end
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    promise.stub :value!, response do
-      @virtual_networks.stub :get, promise do
-        assert_raises RuntimeError do
-          @service.remove_address_prefixes_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.0/16'])
-        end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @virtual_networks.stub :get, response do
+      assert_raises RuntimeError do
+        @service.remove_address_prefixes_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.0/16'])
       end
     end
   end

data/test/requests/network/test_remove_dns_servers_from_virtual_network.rb

@@ -4,41 +4,25 @@ require File.expand_path '../../test_helper', __dir__
 class TestRemoveDnsServersInVirtualNetwork < Minitest::Test
   def setup
     @service = Fog::Network::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@network_client)
-    @virtual_networks = client.virtual_networks
+    @network_client = @service.instance_variable_get(:@network_client)
+    @virtual_networks = @network_client.virtual_networks
   end
 
   def test_remove_dns_servers_in_virtual_network_success
-    promise_get = Concurrent::Promise.execute do
-    end
-    promise_create = Concurrent::Promise.execute do
-    end
-
-    mocked_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response
-    expected_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response
-    expected_response = Azure::ARM::Network::Models::VirtualNetwork.serialize_object(expected_response.body)
-    expected_response['properties']['dhcpOptions']['dnsServers'].delete('10.1.0.5')
-
-    promise_get.stub :value!, mocked_response do
-      promise_create.stub :value!, mocked_response do
-        @virtual_networks.stub :get, promise_get do
-          @virtual_networks.stub :create_or_update, promise_create do
-            assert_equal @service.remove_dns_servers_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.5']), expected_response
-          end
-        end
+    mocked_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response(@network_client)
+    mocked_response.dhcp_options.dns_servers.delete('10.1.0.5')
+    @virtual_networks.stub :get, mocked_response do
+      @virtual_networks.stub :create_or_update, mocked_response do
+        assert_equal @service.remove_dns_servers_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.5']), mocked_response
       end
     end
   end
 
   def test_remove_dns_servers_in_virtual_network_failure
-    promise = Concurrent::Promise.execute do
-    end
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    promise.stub :value!, response do
-      @virtual_networks.stub :get, promise do
-        assert_raises RuntimeError do
-          @service.remove_dns_servers_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.5'])
-        end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @virtual_networks.stub :get, response do
+      assert_raises RuntimeError do
+        @service.remove_dns_servers_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['10.1.0.5'])
       end
     end
   end

data/test/requests/network/test_remove_security_rule.rb

@@ -4,45 +4,25 @@ require File.expand_path '../../test_helper', __dir__
 class TestRemoveSecurityRule < Minitest::Test
   def setup
     @service = Fog::Network::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@network_client)
-    @network_security_groups = client.network_security_groups
+    @client = @service.instance_variable_get(:@network_client)
+    @network_security_groups = @client.network_security_groups
   end
 
   def test_remove_security_rule_success
-    mocked_response = ApiStub::Requests::Network::NetworkSecurityGroup.add_security_rules_response
-    expected_response_json = ApiStub::Requests::Network::NetworkSecurityGroup.create_network_security_group_response
-    expected_response = Azure::ARM::Network::Models::NetworkSecurityGroup.serialize_object(expected_response_json.body)
-    get_promise = Concurrent::Promise.execute do
-    end
-    create_promise = Concurrent::Promise.execute do
-    end
-
-    get_promise .stub :value!, mocked_response do
-      @network_security_groups.stub :get, get_promise do
-        create_promise .stub :value!, expected_response_json do
-          @network_security_groups.stub :begin_create_or_update, create_promise do
-            assert_equal @service.remove_security_rule('fog-test-rg', 'fog-test-nsg', 'testRule'), expected_response
-          end
-        end
+    mocked_response = ApiStub::Requests::Network::NetworkSecurityGroup.add_security_rules_response(@client)
+    expected_response_json = ApiStub::Requests::Network::NetworkSecurityGroup.create_network_security_group_response(@client)
+    @network_security_groups.stub :get, mocked_response do
+      @network_security_groups.stub :begin_create_or_update, expected_response_json do
+        assert_equal @service.remove_security_rule('fog-test-rg', 'fog-test-nsg', 'testRule'), expected_response_json
       end
     end
   end
 
   def test_remove_security_rule_failure
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    get_promise = Concurrent::Promise.execute do
-    end
-    create_promise = Concurrent::Promise.execute do
-    end
-    get_promise .stub :value!, response do
-      @network_security_groups.stub :get, get_promise do
-        create_promise.stub :value!, response do
-          @network_security_groups.stub :begin_create_or_update, create_promise do
-            assert_raises MsRestAzure::AzureOperationError do
-              @service.remove_security_rule('fog-test-rg', 'fog-test-nsg', 'testRule')
-            end
-          end
-        end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @network_security_groups.stub :get, response do
+      assert_raises MsRestAzure::AzureOperationError do
+        @service.remove_security_rule('fog-test-rg', 'fog-test-nsg', 'testRule')
       end
     end
   end

data/test/requests/network/test_remove_subnets_from_virtual_network.rb

@@ -4,41 +4,25 @@ require File.expand_path '../../test_helper', __dir__
 class TestRemoveSubnetsInVirtualNetwork < Minitest::Test
   def setup
     @service = Fog::Network::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@network_client)
-    @virtual_networks = client.virtual_networks
+    @network_client = @service.instance_variable_get(:@network_client)
+    @virtual_networks = @network_client.virtual_networks
   end
 
   def test_remove_subnets_in_virtual_network_success
-    promise_get = Concurrent::Promise.execute do
-    end
-    promise_create = Concurrent::Promise.execute do
-    end
-
-    mocked_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response
-    expected_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response
-    expected_response = Azure::ARM::Network::Models::VirtualNetwork.serialize_object(expected_response.body)
-    expected_response['properties']['subnets'].delete_at(0)
-
-    promise_get.stub :value!, mocked_response do
-      promise_create.stub :value!, mocked_response do
-        @virtual_networks.stub :get, promise_get do
-          @virtual_networks.stub :create_or_update, promise_create do
-            assert_equal @service.remove_subnets_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['mysubnet1']), expected_response
-          end
-        end
+    mocked_response = ApiStub::Requests::Network::VirtualNetwork.create_virtual_network_response(@network_client)
+    mocked_response.subnets.delete_at(0)
+    @virtual_networks.stub :get, mocked_response do
+      @virtual_networks.stub :create_or_update, mocked_response do
+        assert_equal @service.remove_subnets_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['mysubnet1']), mocked_response
       end
     end
   end
 
   def test_remove_subnets_in_virtual_network_failure
-    promise = Concurrent::Promise.execute do
-    end
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    promise.stub :value!, response do
-      @virtual_networks.stub :get, promise do
-        assert_raises RuntimeError do
-          @service.remove_subnets_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['mysubnet1'])
-        end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @virtual_networks.stub :get, response do
+      assert_raises RuntimeError do
+        @service.remove_subnets_from_virtual_network('fog-test-rg', 'fog-test-virtual-network', ['mysubnet1'])
       end
     end
   end

data/test/requests/resources/test_create_deployment.rb

@@ -4,8 +4,8 @@ require File.expand_path '../../test_helper', __dir__
 class TestCreateDeployment < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @deployments = client.deployments
+    @client = @service.instance_variable_get(:@rmc)
+    @deployments = @client.deployments
     @resource_group = 'fog-test-rg'
     @deployment_name = 'fog-test-deployment'
     @template_link = 'https://test.com/template.json'
@@ -13,36 +13,19 @@ class TestCreateDeployment < Minitest::Test
   end
 
   def test_create_deployment_success
-    validate_deployment_promise = Concurrent::Promise.execute do
-    end
-    create_deployment_promise = Concurrent::Promise.execute do
-    end
-    mocked_response = ApiStub::Requests::Resources::Deployment.create_deployment_response
-    expected_response = Azure::ARM::Resources::Models::DeploymentExtended.serialize_object(mocked_response.body)
-    validate_deployment_promise.stub :value!, true do
-      @deployments.stub :validate, validate_deployment_promise do
-        create_deployment_promise.stub :value!, mocked_response do
-          @deployments.stub :create_or_update, create_deployment_promise do
-            assert_equal @service.create_deployment(@resource_group, @deployment_name, @template_link, @parameters_link), expected_response
-          end
-        end
+    mocked_response = ApiStub::Requests::Resources::Deployment.create_deployment_response(@client)
+    @deployments.stub :validate, true do
+      @deployments.stub :create_or_update, mocked_response do
+        assert_equal @service.create_deployment(@resource_group, @deployment_name, @template_link, @parameters_link), mocked_response
       end
     end
   end
 
   def test_create_deployment_failure
-    validate_deployment_promise = Concurrent::Promise.execute do
-    end
-    create_deployment_promise = Concurrent::Promise.execute do
-    end
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    validate_deployment_promise.stub :value!, true do
-      @deployments.stub :validate, validate_deployment_promise do
-        create_deployment_promise.stub :value!, response do
-          @deployments.stub :create_or_update, create_deployment_promise do
-            assert_raises(RuntimeError) { @service.create_deployment(@resource_group, @deployment_name, @template_link, @parameters_link) }
-          end
-        end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @deployments.stub :validate, true do
+      @deployments.stub :create_or_update, response do
+        assert_raises(Fog::AzureRm::OperationError) { @service.create_deployment(@resource_group, @deployment_name, @template_link, @parameters_link) }
       end
     end
   end

data/test/requests/resources/test_create_resource_group.rb

@@ -4,28 +4,21 @@ require File.expand_path '../../test_helper', __dir__
 class TestCreateResourceGroup < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @resource_groups = client.resource_groups
-    @promise = Concurrent::Promise.execute do
-    end
+    @client = @service.instance_variable_get(:@rmc)
+    @resource_groups = @client.resource_groups
   end
 
   def test_create_resource_group_success
-    mocked_response = ApiStub::Requests::Resources::ResourceGroup.create_resource_group_response
-    expected_response = Azure::ARM::Resources::Models::ResourceGroup.serialize_object(mocked_response.body)
-    @promise.stub :value!, mocked_response do
-      @resource_groups.stub :create_or_update, @promise do
-        assert_equal @service.create_resource_group('fog-test-rg', 'west us'), expected_response
-      end
+    mocked_response = ApiStub::Requests::Resources::ResourceGroup.create_resource_group_response(@client)
+    @resource_groups.stub :create_or_update, mocked_response do
+      assert_equal @service.create_resource_group('fog-test-rg', 'west us'), mocked_response
     end
   end
 
   def test_create_resource_group_failure
-    response = -> { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, response do
-      @resource_groups.stub :create_or_update, @promise do
-        assert_raises(RuntimeError) { @service.create_resource_group('fog-test-rg', 'west us') }
-      end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @resource_groups.stub :create_or_update, response do
+      assert_raises(Fog::AzureRm::OperationError) { @service.create_resource_group('fog-test-rg', 'west us') }
     end
   end
 end

data/test/requests/resources/test_delete_deployment.rb

@@ -6,26 +6,20 @@ class TestDeleteDeployment < Minitest::Test
     @service = Fog::Resources::AzureRM.new(credentials)
     client = @service.instance_variable_get(:@rmc)
     @deployments = client.deployments
-    @promise = Concurrent::Promise.execute do
-    end
     @resource_group = 'fog-test-rg'
     @deployment_name = 'fog-test-deployment'
   end
 
   def test_delete_deployment_success
-    @promise.stub :value!, true do
-      @deployments.stub :delete, @promise do
-        assert @service.delete_deployment(@resource_group, @deployment_name)
-      end
+    @deployments.stub :delete, true do
+      assert @service.delete_deployment(@resource_group, @deployment_name)
     end
   end
 
   def test_list_deployment_failure
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, response do
-      @deployments.stub :delete, @promise do
-        assert_raises(RuntimeError) { @service.delete_deployment(@resource_group, @deployment_name) }
-      end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @deployments.stub :delete, response do
+      assert_raises(Fog::AzureRm::OperationError) { @service.delete_deployment(@resource_group, @deployment_name) }
     end
   end
 end

data/test/requests/resources/test_delete_resource_group.rb

@@ -4,27 +4,21 @@ require File.expand_path '../../test_helper', __dir__
 class TestDeleteResourceGroup < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @resource_groups = client.resource_groups
-    @promise = Concurrent::Promise.execute do
-    end
+    @client = @service.instance_variable_get(:@rmc)
+    @resource_groups = @client.resource_groups
   end
 
   def test_delete_resource_group_success
-    response = ApiStub::Requests::Resources::ResourceGroup.create_resource_group_response
-    @promise.stub :value!, response do
-      @resource_groups.stub :delete, @promise do
-        assert @service.delete_resource_group('fog-test-rg')
-      end
+    response = ApiStub::Requests::Resources::ResourceGroup.create_resource_group_response(@client)
+    @resource_groups.stub :delete, response do
+      assert @service.delete_resource_group('fog-test-rg')
     end
   end
 
   def test_delete_resource_group_failure
-    response = -> { fail MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, response do
-      @resource_groups.stub :delete, @promise do
-        assert_raises(RuntimeError) { @service.delete_resource_group('fog-test-rg') }
-      end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @resource_groups.stub :delete, response do
+      assert_raises(Fog::AzureRm::OperationError) { @service.delete_resource_group('fog-test-rg') }
     end
   end
 end

data/test/requests/resources/test_delete_resource_tag.rb

@@ -4,42 +4,26 @@ require File.expand_path '../../test_helper', __dir__
 class TestDeleteResourceTag < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @resources = client.resources
+    @client = @service.instance_variable_get(:@rmc)
+    @resources = @client.resources
+    @resource_response = ApiStub::Requests::Resources::AzureResource.azure_resource_response(@client)
   end
 
   def test_delete_resource_tag_success
-    response = ApiStub::Requests::Resources::AzureResource.azure_resource_response
-    promise_get = Concurrent::Promise.execute do
-    end
-    promise_update = Concurrent::Promise.execute do
-    end
-    promise_get.stub :value!, response do
-      @resources.stub :get, promise_get do
-        promise_update.stub :value!, response do
-          @resources.stub :create_or_update, promise_update do
-            resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
-            assert @service.delete_resource_tag(resource_id, 'tag_name', 'tag_value')
-          end
-        end
+    @resources.stub :get, @resource_response do
+      @resources.stub :create_or_update, @resource_response do
+        resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
+        assert @service.delete_resource_tag(resource_id, 'tag_name', 'tag_value')
       end
     end
   end
 
   def test_delete_resource_tag_failure
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    promise_get = Concurrent::Promise.execute do
-    end
-    promise_update = Concurrent::Promise.execute do
-    end
-    promise_get.stub :value!, response do
-      @resources.stub :get, promise_get do
-        promise_update.stub :value!, response do
-          @resources.stub :create_or_update, promise_update do
-            resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
-            assert_raises(RuntimeError) { @service.delete_resource_tag(resource_id, 'tag_name', 'tag_value') }
-          end
-        end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @resources.stub :get, @resource_response do
+      @resources.stub :create_or_update, response do
+        resource_id = '/subscriptions/########-####-####-####-############/resourceGroups/{RESOURCE-GROUP}/providers/Microsoft.Network/{PROVIDER-NAME}/{RESOURCE-NAME}'
+        assert_raises(Fog::AzureRm::OperationError) { @service.delete_resource_tag(resource_id, 'tag_name', 'tag_value') }
       end
     end
   end

data/test/requests/resources/test_list_deployments.rb

@@ -4,29 +4,22 @@ require File.expand_path '../../test_helper', __dir__
 class TestListDeployment < Minitest::Test
   def setup
     @service = Fog::Resources::AzureRM.new(credentials)
-    client = @service.instance_variable_get(:@rmc)
-    @deployments = client.deployments
-    @promise = Concurrent::Promise.execute do
-    end
+    @client = @service.instance_variable_get(:@rmc)
+    @deployments = @client.deployments
     @resource_group = 'fog-test-rg'
   end
 
   def test_list_deployment_success
-    mocked_response = ApiStub::Requests::Resources::Deployment.list_deployment_response
-    expected_response = Azure::ARM::Resources::Models::DeploymentListResult.serialize_object(mocked_response.body)['value']
-    @promise.stub :value!, mocked_response do
-      @deployments.stub :list, @promise do
-        assert_equal @service.list_deployments(@resource_group), expected_response
-      end
+    mocked_response = ApiStub::Requests::Resources::Deployment.list_deployment_response(@client)
+    @deployments.stub :list_as_lazy, mocked_response do
+      assert_equal @service.list_deployments(@resource_group), mocked_response.value
     end
   end
 
   def test_list_deployment_failure
-    response = -> { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
-    @promise.stub :value!, response do
-      @deployments.stub :list, @promise do
-        assert_raises(RuntimeError) { @service.list_deployments(@resource_group) }
-      end
+    response = proc { raise MsRestAzure::AzureOperationError.new(nil, nil, 'error' => { 'message' => 'mocked exception' }) }
+    @deployments.stub :list_as_lazy, response do
+      assert_raises(Fog::AzureRm::OperationError) { @service.list_deployments(@resource_group) }
     end
   end
 end