vcloud-core 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+## 0.0.6 (2014-02-13)
+
+Features:
+
+  - adds EdgeGateway.interfaces for returning array of EdgeGatewayInterface objects
+    associated with the EdgeGateway
+  - adds EdgeGatewayInterface class, representing a vCloud GatewayInterfaceType
+
+## 0.0.5 (2014-01-29)
+
+Features:
+
+  - adds support for retrieving gateway interface by id
+
+## 0.0.4 (2014-01-23)
+
+Features:
+
+  - adds ability to update Edge Gateway configuration
+
+## 0.0.1 (2014-01-17)
+
+  - First release of gem

data/lib/vcloud/core.rb

@@ -8,6 +8,7 @@ require 'vcloud/core/metadata_helper'
 require 'vcloud/core/compute_metadata'
 require 'vcloud/core/vdc'
 require 'vcloud/core/edge_gateway'
+require 'vcloud/core/edge_gateway_interface'
 require 'vcloud/core/vm'
 require 'vcloud/core/vapp'
 require 'vcloud/core/vapp_template'

data/lib/vcloud/core/edge_gateway.rb

@@ -55,6 +55,15 @@ module Vcloud
         vcloud_attributes[:name]
       end
 
+      def interfaces
+        gateway_config = vcloud_attributes[:Configuration]
+        return [] unless gateway_config[:GatewayInterfaces]
+        return [] unless gateway_interfaces = gateway_config[:GatewayInterfaces][:GatewayInterface]
+        gateway_interfaces.map do |vcloud_gateway_interface_hash|
+          EdgeGatewayInterface.new(vcloud_gateway_interface_hash)
+        end
+      end
+
     end
   end
 end

data/lib/vcloud/core/edge_gateway_interface.rb

@@ -0,0 +1,30 @@
+module Vcloud
+  module Core
+    class EdgeGatewayInterface
+
+      attr_accessor :name, :network_href, :network_name
+
+      def initialize(gateway_interface_hash)
+        raise "Argument error: nil not allowed" if gateway_interface_hash.nil?
+        @vcloud_gateway_interface = gateway_interface_hash
+        unless @name = gateway_interface_hash[:Name]
+          raise "Argument error: must have a :Name"
+        end
+        unless network_section = gateway_interface_hash[:Network]
+          raise "Argument error: must have a :Network section"
+        end
+        unless @network_href = network_section[:href]
+          raise "Argument error: must have a :Network[:href]"
+        end
+        unless @network_name = network_section[:name]
+          raise "Argument error: must have a :Network[:name]"
+        end
+      end
+
+      def network_id
+        network_href.split('/').last
+      end
+
+    end
+  end
+end

data/lib/vcloud/core/version.rb

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

data/spec/vcloud/core/edge_gateway_interface_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+module Vcloud
+  module Core
+    describe EdgeGatewayInterface do
+
+      before(:each) do
+        @valid_ext_id = "12345678-70ac-487e-9c1e-124716764274"
+        @gateway_interface_hash = {
+          :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"
+        }
+        @interface = EdgeGatewayInterface.new(@gateway_interface_hash)
+      end
+
+      context "Instance public interface" do
+        subject { EdgeGatewayInterface.new(@gateway_interface_hash) }
+        it { should respond_to(:name) }
+        it { should respond_to(:network_id) }
+        it { should respond_to(:network_name) }
+        it { should respond_to(:network_href) }
+      end
+
+      context "#initialize" do
+
+        it "should be constructable from just a Fog vCloud GatewayInterfaceType hash" do
+          obj = EdgeGatewayInterface.new(@gateway_interface_hash)
+          expect(obj.class).to be(Vcloud::Core::EdgeGatewayInterface)
+        end
+
+        it "should raise an error if passed a nil value" do
+          expect { EdgeGatewayInterface.new(nil) }.to raise_error("Argument error: nil not allowed")
+        end
+
+        it "should raise an error if a :Name is not passed" do
+          expect { EdgeGatewayInterface.new({}) }.to raise_error("Argument error: must have a :Name")
+        end
+
+        it "should raise an error if a :Network is not passed" do
+          expect { EdgeGatewayInterface.new({Name: 'test-interface'}) }.to raise_error("Argument error: must have a :Network section")
+        end
+
+        it "should raise an error if a :Network :href is not passed" do
+          bad_input = {
+            Name: 'test-interface',
+            Network: { name: "test-network" }
+          }
+          expect { EdgeGatewayInterface.new(bad_input) }.to raise_error("Argument error: must have a :Network[:href]")
+        end
+
+        it "should raise an error if a :Network :name is not passed" do
+          bad_input = {
+            Name: 'test-interface',
+            Network: { href: "http://example.com/1234" }
+          }
+          expect { EdgeGatewayInterface.new(bad_input) }.to raise_error("Argument error: must have a :Network[:name]")
+        end
+
+      end
+
+      context "#name" do
+        it "should return the name of the interface" do
+          expect(@interface.name).to eq('EXTERNAL_NETWORK')
+        end
+      end
+
+      context "#network_id" do
+        it "should return the id of the network the interface is connected to" do
+          expect(@interface.network_id).to eq(@valid_ext_id)
+        end
+      end
+
+      context "#network_name" do
+        it "should return the name of the network the interface is connected to" do
+          expect(@interface.network_name).to eq('EXTERNAL_NETWORK')
+        end
+      end
+
+      context "#network_href" do
+        it "should return the href of the network the interface is connected to" do
+          expect(@interface.network_href).to eq("https://example.com/api/admin/network/#{@valid_ext_id}")
+        end
+      end
+
+    end
+
+  end
+
+end

data/spec/vcloud/core/edge_gateway_spec.rb

@@ -73,7 +73,7 @@ module Vcloud
 
       end
 
-      context "#vcloud_gateway_interface_by_id" do
+      context "Interface related tests" do
 
         before(:each) do
           @valid_ext_id = "12345678-70ac-487e-9c1e-124716764274"
@@ -117,29 +117,42 @@ module Vcloud
           @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
+        context "#vcloud_gateway_interface_by_id" do
+
+          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
 
-        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"
-                   },
-                 )
+        context "#interfaces" do
+
+          it "should return an array of EdgeGatewayInterface objects" do
+            interfaces_list = @edgegw.interfaces
+            expect(interfaces_list.class).to be(Array)
+            expect(interfaces_list.first.class).to be(Vcloud::Core::EdgeGatewayInterface)
+          end
+
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,6 +127,7 @@ files:
 - lib/vcloud/core.rb
 - lib/vcloud/core/compute_metadata.rb
 - lib/vcloud/core/edge_gateway.rb
+- lib/vcloud/core/edge_gateway_interface.rb
 - lib/vcloud/core/entity.rb
 - lib/vcloud/core/metadata_helper.rb
 - lib/vcloud/core/org_vdc_network.rb
@@ -144,6 +146,7 @@ files:
 - spec/integration/edge_gateway/edge_gateway_spec.rb
 - spec/spec_helper.rb
 - spec/support/stub_fog_interface.rb
+- spec/vcloud/core/edge_gateway_interface_spec.rb
 - spec/vcloud/core/edge_gateway_spec.rb
 - spec/vcloud/core/metadata_helper_spec.rb
 - spec/vcloud/core/org_vdc_network_spec.rb
@@ -178,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -849601463027409956
+      hash: 4034652362745429730
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -190,6 +193,7 @@ test_files:
 - spec/integration/edge_gateway/edge_gateway_spec.rb
 - spec/spec_helper.rb
 - spec/support/stub_fog_interface.rb
+- spec/vcloud/core/edge_gateway_interface_spec.rb
 - spec/vcloud/core/edge_gateway_spec.rb
 - spec/vcloud/core/metadata_helper_spec.rb
 - spec/vcloud/core/org_vdc_network_spec.rb