vcloud-core 0.0.4 → 0.0.5

data/.gitignore

@@ -1,2 +1,3 @@
 /Gemfile.lock
 /coverage/
+.idea

data/lib/vcloud/core/edge_gateway.rb

@@ -26,6 +26,15 @@ module Vcloud
         fsi.post_configure_edge_gateway_services(id, config)
       end
 
+      def vcloud_gateway_interface_by_id gateway_interface_id
+        gateway_interfaces = vcloud_attributes[:Configuration][:GatewayInterfaces][:GatewayInterface]
+        unless gateway_interfaces.empty?
+          return gateway_interfaces.find{ |interface|
+            interface[:Network][:href].split('/').last == gateway_interface_id
+          }
+        end
+      end
+
       def self.get_by_name(name)
         ids = self.get_ids_by_name(name)
         raise "edgeGateway #{name} not found" if ids.size == 0

data/lib/vcloud/core/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Core
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/spec/integration/edge_gateway/edge_gateway_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+module Vcloud
+  module Core
+    describe EdgeGateway do
+      context "get vcloud attributes for given gateway interface id " do
+        before(:all) do
+          @edge_gateway = EdgeGateway.get_by_name(ENV['VCLOUD_EDGE_GATEWAY'])
+        end
+        it "should return provider network" do
+          gateway_interface = @edge_gateway.vcloud_gateway_interface_by_id(ENV['VCLOUD_PROVIDER_NETWORK_ID'])
+          expect(gateway_interface[:Network]).not_to be_nil
+          expect(gateway_interface[:Network][:href]).to include(ENV['VCLOUD_PROVIDER_NETWORK_ID'])
+        end
+
+        it "should return orgVdcNetwork" do
+          gateway_interface = @edge_gateway.vcloud_gateway_interface_by_id(ENV['VCLOUD_NETWORK1_ID'])
+          expect(gateway_interface[:Network]).not_to be_nil
+          expect(gateway_interface[:Network][:href]).to include(ENV['VCLOUD_NETWORK1_ID'])
+        end
+
+        it "return nil if network with given id is not found" do
+          gateway_interface = @edge_gateway.vcloud_gateway_interface_by_id(SecureRandom.uuid)
+          expect(gateway_interface).to be_nil
+        end
+      end
+    end
+  end
+end

data/spec/vcloud/core/edge_gateway_spec.rb

@@ -20,6 +20,7 @@ module Vcloud
         it { should respond_to(:id) }
         it { should respond_to(:name) }
         it { should respond_to(:href) }
+        it { should respond_to(:vcloud_gateway_interface_by_id) }
       end
 
       context "#initialize" do
@@ -72,6 +73,77 @@ module Vcloud
 
       end
 
+      context "#vcloud_gateway_interface_by_id" do
+
+        before(:each) do
+          @valid_ext_id = "12345678-70ac-487e-9c1e-124716764274"
+          @valid_int_id = "12345678-70ac-487e-9c1e-552f1f0a91dc"
+          edge_gateway_hash = {
+            :Configuration=>
+              {:GatewayBackingConfig=>"compact",
+               :GatewayInterfaces=>
+                {:GatewayInterface=>
+                  [{:Name=>"EXTERNAL_NETWORK",
+                    :Network=>
+                     {:type=>"application/vnd.vmware.admin.network+xml",
+                      :name=>"EXTERNAL_NETWORK",
+                      :href=>
+                       "https://example.com/api/admin/network/#{@valid_ext_id}"},
+                    :InterfaceType=>"uplink",
+                    :SubnetParticipation=>
+                     {:Gateway=>"192.2.0.1",
+                      :Netmask=>"255.255.255.0",
+                      :IpAddress=>"192.2.0.66"},
+                    :UseForDefaultRoute=>"true"},
+                   {:Name=>"INTERNAL_NETWORK",
+                    :Network=>
+                     {:type=>"application/vnd.vmware.admin.network+xml",
+                      :name=>"INTERNAL_NETWORK",
+                      :href=>
+                       "https://example.com/api/admin/network/#{@valid_int_id}"},
+                    :InterfaceType=>"internal",
+                    :SubnetParticipation=>
+                     {:Gateway=>"192.168.1.1",
+                      :Netmask=>"255.255.255.0",
+                      :IpAddress=>"192.168.1.55"},
+                    :UseForDefaultRoute=>"false"
+                   },
+                  ]
+                }
+              }
+          }
+          @mock_fog_interface.should_receive(:get_edge_gateway).
+            and_return(edge_gateway_hash)
+          @edgegw = EdgeGateway.new(@edgegw_id)
+        end
+
+        it "should return nil if the network id is not found" do
+          expect(@edgegw.vcloud_gateway_interface_by_id(
+               '12345678-1234-1234-1234-123456789012')).
+            to be_nil
+        end
+
+        it "should return a vcloud network hash if the network id is found" do
+          expect(@edgegw.vcloud_gateway_interface_by_id(@valid_int_id)).
+            to eq(
+                   {:Name=>"INTERNAL_NETWORK",
+                    :Network=>
+                     {:type=>"application/vnd.vmware.admin.network+xml",
+                      :name=>"INTERNAL_NETWORK",
+                      :href=>
+                       "https://example.com/api/admin/network/#{@valid_int_id}"},
+                    :InterfaceType=>"internal",
+                    :SubnetParticipation=>
+                     {:Gateway=>"192.168.1.1",
+                      :Netmask=>"255.255.255.0",
+                      :IpAddress=>"192.168.1.55"},
+                    :UseForDefaultRoute=>"false"
+                   },
+                 )
+        end
+
+      end
+
     end
 
   end

data/spec/vcloud/fog/service_interface_spec.rb

@@ -10,8 +10,8 @@ module Vcloud
       it 'should raise a exception if named vdc not found in the data returned' do
 
         fog_facade = double(:FogFacade)
-        expect(fog_facade).to receive(:session).any_number_of_times { FOG_SESSION_RESPONSE }
-        expect(fog_facade).to receive(:get_organization).any_number_of_times { FOG_ORGANIZATION_RESPONSE }
+        expect(fog_facade).to receive(:session).and_return { FOG_SESSION_RESPONSE }
+        expect(fog_facade).to receive(:get_organization).and_return { FOG_ORGANIZATION_RESPONSE }
 
         service_interface = ServiceInterface.new(fog_facade)
 
@@ -21,8 +21,8 @@ module Vcloud
       it 'should raise a exception if named catalog cannot be found in the data returned' do
 
         fog_facade = double(:FogFacade)
-        expect(fog_facade).to receive(:session).any_number_of_times { FOG_SESSION_RESPONSE }
-        expect(fog_facade).to receive(:get_organization).any_number_of_times { FOG_ORGANIZATION_RESPONSE }
+        expect(fog_facade).to receive(:session).and_return { FOG_SESSION_RESPONSE }
+        expect(fog_facade).to receive(:get_organization).and_return { FOG_ORGANIZATION_RESPONSE }
 
         service_interface = ServiceInterface.new(fog_facade)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -141,6 +141,7 @@ files:
 - lib/vcloud/fog/relation.rb
 - lib/vcloud/fog/service_interface.rb
 - spec/integration/edge_gateway/configure_edge_gateway_services_spec.rb
+- spec/integration/edge_gateway/edge_gateway_spec.rb
 - spec/spec_helper.rb
 - spec/support/stub_fog_interface.rb
 - spec/vcloud/core/edge_gateway_spec.rb
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4507568303772117812
+      hash: -849601463027409956
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -186,6 +187,7 @@ specification_version: 3
 summary: Core tools for interacting with VMware vCloud Director
 test_files:
 - spec/integration/edge_gateway/configure_edge_gateway_services_spec.rb
+- spec/integration/edge_gateway/edge_gateway_spec.rb
 - spec/spec_helper.rb
 - spec/support/stub_fog_interface.rb
 - spec/vcloud/core/edge_gateway_spec.rb