RubyGems - vcloud-walker - Versions diffs - 3.6.0 → 4.0.0 - Mend

vcloud-walker 3.6.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/CHANGELOG.md +4 -0
data/jenkins_tests.sh +3 -2
data/lib/vcloud/walker/resource/gateway_ipsec_vpn_service.rb +9 -1
data/lib/vcloud/walker/version.rb +1 -1
data/spec/vcloud/walker/resource/gateway_ipsec_vpn_service_spec.rb +124 -69
data/vcloud-walker.gemspec +1 -1
metadata +24 -24

data/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,7 @@
+## 4.0.0 (2015-01-22)
+  - Update dependency on vCloud Core to 1.0.0 since it is now stable.
 ## 3.6.0 (2014-12-03)
 Features:

data/jenkins_tests.sh CHANGED Viewed

@@ -2,10 +2,12 @@
 set -eu
 function cleanup {
+  set +e
+  bundle exec vcloud-logout
   rm $FOG_RC
+  unset FOG_RC
 }
-# Override default of ~/.fog and delete afterwards.
 export FOG_RC=$(mktemp /tmp/vcloud_fog_rc.XXXXXXXXXX)
 trap cleanup EXIT
@@ -25,6 +27,5 @@ bundle exec rake
 # Never log token to STDOUT.
 set +x
 eval $(printenv API_PASSWORD | bundle exec vcloud-login)
-trap "bundle exec vcloud-logout" EXIT
 bundle exec rake integration

data/lib/vcloud/walker/resource/gateway_ipsec_vpn_service.rb CHANGED Viewed

@@ -19,7 +19,6 @@ module Vcloud
             @tunnel = {
               :Name => fog_vpn_tunnel[:Name],
               :Description => fog_vpn_tunnel[:Description],
-              :ThirdPartyPeerId => fog_vpn_tunnel[:IpsecVpnThirdPartyPeer][:PeerId],
               :PeerId => fog_vpn_tunnel[:PeerId],
               :LocalId => fog_vpn_tunnel[:LocalId],
               :PeerIpAddress => fog_vpn_tunnel[:PeerIpAddress],
@@ -31,6 +30,15 @@ module Vcloud
               :IsOperational => fog_vpn_tunnel[:IsOperational]
             }
+            if (third_party_peer = fog_vpn_tunnel.fetch(:IpsecVpnThirdPartyPeer, false))
+              @tunnel[:ThirdPartyPeerId] = third_party_peer[:PeerId]
+            end
+            if (local_peer = fog_vpn_tunnel.fetch(:IpsecVpnLocalPeer, false))
+              @tunnel[:LocalPeerId] = local_peer[:Id]
+              @tunnel[:LocalPeerName] = local_peer[:Name]
+            end
             @tunnel[:SharedSecret] = "*" * 65 if fog_vpn_tunnel[:SharedSecret]
             @tunnel[:SharedSecretEncrypted] = "******" if fog_vpn_tunnel[:SharedSecretEncrypted]
             @tunnel[:EncryptionProtocol] = "******" if fog_vpn_tunnel[:EncryptionProtocol]

data/lib/vcloud/walker/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Vcloud
   module Walker
-    VERSION = '3.6.0'
+    VERSION = '4.0.0'
   end
 end

data/spec/vcloud/walker/resource/gateway_ipsec_vpn_service_spec.rb CHANGED Viewed

@@ -1,9 +1,13 @@
 require 'spec_helper'
 describe Vcloud::Walker::Resource::GatewayIpsecVpnService do
+  let(:gateway_vpn_service) {
+    Vcloud::Walker::Resource::GatewayIpsecVpnService.new(fog_vpn_service)
+  }
   context "vpn service with single tunnel" do
-    before(:all) do
-      fog_vpn_service = {
+    let(:fog_vpn_service) do
+      {
         IsEnabled: true,
         Tunnel: {
           Name: "ss_one",
@@ -36,23 +40,23 @@ describe Vcloud::Walker::Resource::GatewayIpsecVpnService do
           IsOperational: "false"
         }
       }
-      @gateway_vpn_service = Vcloud::Walker::Resource::GatewayIpsecVpnService.new(fog_vpn_service)
     end
     it "should report status of vpn service" do
-      expect(@gateway_vpn_service.IsEnabled).to eq(true)
-      expect(@gateway_vpn_service.Tunnels).not_to be_empty
+      expect(gateway_vpn_service.IsEnabled).to eq(true)
+      expect(gateway_vpn_service.Tunnels).not_to be_empty
     end
     context "report tunnel info" do
-      before(:all) do
-        @tunnel = @gateway_vpn_service.Tunnels.first
-      end
+      let(:tunnel) {
+        gateway_vpn_service.Tunnels.first
+      }
       it "with peer details" do
-        expect(@tunnel[:PeerId]).to eq('1')
-        expect(@tunnel[:PeerIpAddress]).to eq('8.8.8.8')
-        expect(@tunnel[:PeerSubnet]).to eq({
+        expect(tunnel[:ThirdPartyPeerId]).to eq('1')
+        expect(tunnel[:PeerId]).to eq('1')
+        expect(tunnel[:PeerIpAddress]).to eq('8.8.8.8')
+        expect(tunnel[:PeerSubnet]).to eq({
                                              Name: "8.8.8.0/8",
                                              Gateway: "8.8.8.0",
                                              Netmask: "255.0.0.0"
@@ -60,9 +64,9 @@ describe Vcloud::Walker::Resource::GatewayIpsecVpnService do
       end
       it "with local network details" do
-        expect(@tunnel[:LocalId]).to eq('1')
-        expect(@tunnel[:LocalIpAddress]).to eq('192.0.2.1')
-        expect(@tunnel[:LocalSubnet]).to eq({
+        expect(tunnel[:LocalId]).to eq('1')
+        expect(tunnel[:LocalIpAddress]).to eq('192.0.2.1')
+        expect(tunnel[:LocalSubnet]).to eq({
                                               Name: "Default",
                                               Gateway: "192.168.0.1",
                                               Netmask: "255.255.0.0"
@@ -70,31 +74,31 @@ describe Vcloud::Walker::Resource::GatewayIpsecVpnService do
       end
       it "with maximum transmission unit" do
-        expect(@tunnel[:Mtu]).to eq('1500')
+        expect(tunnel[:Mtu]).to eq('1500')
       end
       it "with masked vpn shared secret information" do
-        expect(@tunnel[:SharedSecret]).to eq("*" * 65)
-        expect(@tunnel[:SharedSecretEncrypted]).to eq("******")
-        expect(@tunnel[:EncryptionProtocol]).to eq("******")
+        expect(tunnel[:SharedSecret]).to eq("*" * 65)
+        expect(tunnel[:SharedSecretEncrypted]).to eq("******")
+        expect(tunnel[:EncryptionProtocol]).to eq("******")
       end
       it "should skip any addditional vpn details provided by fog" do
-        expect(@tunnel[:AdditionalDetails]).to be_nil
+        expect(tunnel[:AdditionalDetails]).to be_nil
       end
     end
   end
-  it "should report vpn service with multiple tunnels" do
-    fog_vpn_service = {
-      IsEnabled: true,
-      Tunnel: [
-        {
-          Name: "remove vpn 1",
-          Description: "describe me",
-          IpsecVpnThirdPartyPeer: {
-            PeerId: "1"
+  context "vpn service with inter-vDC tunnel" do
+    let(:fog_vpn_service) do
+      {
+        IsEnabled: true,
+        Tunnel: {
+          Name: "ss_one",
+          Description: "desc one",
+          IpsecVpnLocalPeer: {
+            Id: "1",
+            Name: "Foo",
           },
           PeerIpAddress: "8.8.8.8",
           PeerId: "1",
@@ -105,53 +109,104 @@ describe Vcloud::Walker::Resource::GatewayIpsecVpnService do
             Gateway: "192.168.0.1",
             Netmask: "255.255.0.0"
           },
-          PeerSubnet: {
-            Name: "8.8.8.0/8",
-            Gateway: "8.8.8.0",
-            Netmask: "255.0.0.0"
-          },
+          PeerSubnet: [
+            {
+              Name: "Bar",
+              Gateway: "10.0.0.1",
+              Netmask: "255.255.255.0"
+            },
+          ],
           SharedSecret: "DoNotDiscloseDoNotDiscloseDoNotDiscloseDoNotDiscloseDoNotDisclose",
           SharedSecretEncrypted: "false",
           EncryptionProtocol: "AES256",
           Mtu: "1500",
-          AdditionalDetails: {
-            shared_network: true
-          },
-          IsEnabled: "true",
-          IsOperational: "false"
-        },
-        {
-          Name: "remote vpn 2",
-          Description: "describe me",
-          IpsecVpnThirdPartyPeer: {
-            PeerId: "2"
-          },
-          PeerIpAddress: "8.8.4.4",
-          PeerId: "2",
-          LocalIpAddress: "172.26.2.3",
-          LocalId: "2",
-          LocalSubnet: {
-            Name: "Default",
-            Gateway: "192.168.0.1",
-            Netmask: "255.255.0.0"
-          },
-          PeerSubnet: {
-            Name: "8.8.4.4/8",
-            Gateway: "8.8.4.4",
-            Netmask: "255.0.0.0"
-          },
-          SharedSecret: "PrivyPrivyPrivyPrivyPrivyPrivyPrivyPrivyPrivyPrivy",
-          SharedSecretEncrypted: "false",
-          EncryptionProtocol: "AES256",
-          Mtu: "1500",
           IsEnabled: "true",
           IsOperational: "false"
         }
-      ]
-    }
+      }
+    end
-    gateway_vpn_service = Vcloud::Walker::Resource::GatewayIpsecVpnService.new(fog_vpn_service)
-    expect(gateway_vpn_service.Tunnels.count).to eq(2)
+    context "report tunnel info" do
+      let(:tunnel) {
+        gateway_vpn_service.Tunnels.first
+      }
+      it "returns accurate local peer details" do
+        expect(tunnel[:LocalPeerId]).to eq('1')
+        expect(tunnel[:LocalPeerName]).to eq('Foo')
+      end
+    end
   end
+  context "vpn service with multiple tunnels" do
+    let(:fog_vpn_service) do
+      {
+        IsEnabled: true,
+        Tunnel: [
+          {
+            Name: "remove vpn 1",
+            Description: "describe me",
+            IpsecVpnThirdPartyPeer: {
+              PeerId: "1"
+            },
+            PeerIpAddress: "8.8.8.8",
+            PeerId: "1",
+            LocalIpAddress: "192.0.2.1",
+            LocalId: "1",
+            LocalSubnet: {
+              Name: "Default",
+              Gateway: "192.168.0.1",
+              Netmask: "255.255.0.0"
+            },
+            PeerSubnet: {
+              Name: "8.8.8.0/8",
+              Gateway: "8.8.8.0",
+              Netmask: "255.0.0.0"
+            },
+            SharedSecret: "DoNotDiscloseDoNotDiscloseDoNotDiscloseDoNotDiscloseDoNotDisclose",
+            SharedSecretEncrypted: "false",
+            EncryptionProtocol: "AES256",
+            Mtu: "1500",
+            AdditionalDetails: {
+              shared_network: true
+            },
+            IsEnabled: "true",
+            IsOperational: "false"
+          },
+          {
+            Name: "remote vpn 2",
+            Description: "describe me",
+            IpsecVpnThirdPartyPeer: {
+              PeerId: "2"
+            },
+            PeerIpAddress: "8.8.4.4",
+            PeerId: "2",
+            LocalIpAddress: "172.26.2.3",
+            LocalId: "2",
+            LocalSubnet: {
+              Name: "Default",
+              Gateway: "192.168.0.1",
+              Netmask: "255.255.0.0"
+            },
+            PeerSubnet: {
+              Name: "8.8.4.4/8",
+              Gateway: "8.8.4.4",
+              Netmask: "255.0.0.0"
+            },
+            SharedSecret: "PrivyPrivyPrivyPrivyPrivyPrivyPrivyPrivyPrivyPrivy",
+            SharedSecretEncrypted: "false",
+            EncryptionProtocol: "AES256",
+            Mtu: "1500",
+            IsEnabled: "true",
+            IsOperational: "false"
+          }
+        ]
+      }
+    end
+    it "should report vpn service with multiple tunnels" do
+      expect(gateway_vpn_service.Tunnels.count).to eq(2)
+    end
+  end
 end

data/vcloud-walker.gemspec CHANGED Viewed

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'fog', '>= 1.21.0'
   s.add_runtime_dependency 'json', '~> 1.8.0'
-  s.add_runtime_dependency 'vcloud-core', '~> 0.16.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 1.0.0'
   s.add_development_dependency 'gem_publisher', '1.2.0'
   s.add_development_dependency 'json_spec', '~> 1.1.1'
   s.add_development_dependency 'rake'

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-walker
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 4.0.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &5117360 !ruby/object:Gem::Requirement
+  requirement: &3706860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.21.0
   type: :runtime
   prerelease: false
-  version_requirements: *5117360
+  version_requirements: *3706860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &5116480 !ruby/object:Gem::Requirement
+  requirement: &3718440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 1.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *5116480
+  version_requirements: *3718440
 - !ruby/object:Gem::Dependency
   name: vcloud-core
-  requirement: &5115820 !ruby/object:Gem::Requirement
+  requirement: &3716960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *5115820
+  version_requirements: *3716960
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &5115180 !ruby/object:Gem::Requirement
+  requirement: &3715360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *5115180
+  version_requirements: *3715360
 - !ruby/object:Gem::Dependency
   name: json_spec
-  requirement: &5114600 !ruby/object:Gem::Requirement
+  requirement: &3738240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *5114600
+  version_requirements: *3738240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5114140 !ruby/object:Gem::Requirement
+  requirement: &4569520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5114140
+  version_requirements: *4569520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &5113460 !ruby/object:Gem::Requirement
+  requirement: &4578740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: *5113460
+  version_requirements: *4578740
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &5112820 !ruby/object:Gem::Requirement
+  requirement: &4576140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.14.3
   type: :development
   prerelease: false
-  version_requirements: *5112820
+  version_requirements: *4576140
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: &5112000 !ruby/object:Gem::Requirement
+  requirement: &4596780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.23.0
   type: :development
   prerelease: false
-  version_requirements: *5112000
+  version_requirements: *4596780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &5111280 !ruby/object:Gem::Requirement
+  requirement: &4192100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *5111280
+  version_requirements: *4192100
 description: ! "Vcloud-walker is a command line tool to describe different vCloud
   entities.\n                    This tool is a thin layer around fog api, which exposes
   summarized vCloud entities\n                    in the form of JSON"
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3886802048453073772
+      hash: 111889673649538721
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.11