fog-openstack 0.1.1 → 0.1.2

data/lib/fog/openstack/requests/network/get_ipsec_site_connection.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def get_ipsec_site_connection(ipsec_site_connection_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "vpn/ipsec-site-connections/#{ipsec_site_connection_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_ipsec_site_connection(ipsec_site_connection_id)
+          response = Excon::Response.new
+          if data = self.data[:ipsec_site_connections][ipsec_site_connection_id]
+            response.status = 200
+            response.body   = {'ipsec_site_connection' => data}
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/get_network.rb

@@ -16,19 +16,7 @@ module Fog
           response = Excon::Response.new
           if data = self.data[:networks][network_id]
             response.status = 200
-            response.body = {
-              'network' => {
-                'id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
-                'name' => 'network_1',
-                'subnets' => [
-                  '2e4ec6a4-0150-47f5-8523-e899ac03026e'
-                ],
-                'shared' => false,
-                'status' => 'ACTIVE',
-                'admin_state_up' => true,
-                'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9',
-              }
-            }
+            response.body = {'network' => data}
             response
           else
             raise Fog::Network::OpenStack::NotFound

data/lib/fog/openstack/requests/network/get_vpn_service.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def get_vpn_service(vpn_service_id)
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "vpn/vpnservices/#{vpn_service_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_vpn_service(vpn_service_id)
+          response = Excon::Response.new
+          if data = self.data[:vpn_services][vpn_service_id]
+            response.status = 200
+            response.body   = {'vpnservice' => data}
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/list_ike_policies.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def list_ike_policies(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'vpn/ikepolicies',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_ike_policies(*)
+          Excon::Response.new(
+            :body   => {'ikepolicies' => data[:ike_policies].values},
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/list_ipsec_policies.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def list_ipsec_policies(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'vpn/ipsecpolicies',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_ipsec_policies(*)
+          Excon::Response.new(
+            :body   => {'ipsecpolicies' => data[:ipsec_policies].values},
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/list_ipsec_site_connections.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def list_ipsec_site_connections(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'vpn/ipsec-site-connections',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_ipsec_site_connections(*)
+          Excon::Response.new(
+            :body   => {'ipsec_site_connections' => data[:ipsec_site_connections].values},
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/list_vpn_services.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def list_vpn_services(filters = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'vpn/vpnservices',
+            :query   => filters
+          )
+        end
+      end
+
+      class Mock
+        def list_vpn_services(*)
+          Excon::Response.new(
+            :body   => {'vpnservices' => data[:vpn_services].values},
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_ike_policy.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def update_ike_policy(ike_policy_id, options = {})
+          data = {'ikepolicy' => {}}
+
+          vanilla_options = [:name, :description, :tenant_id,
+                             :auth_algorithm, :encryption_algorithm,
+                             :pfs, :phase1_negotiation_mode,
+                             :lifetime, :ike_version
+                            ]
+          vanilla_options.select { |o| options.key?(o) }.each do |key|
+            data['ikepolicy'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "vpn/ikepolicies/#{ike_policy_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_ike_policy(ike_policy_id, options = {})
+          response = Excon::Response.new
+          if ike_policy = list_ike_policies.body['ikepolicies'].detect { |instance| instance['id'] == ike_policy_id }
+            ike_policy['name']                    = options[:name]
+            ike_policy['description']             = options[:description]
+            ike_policy['tenant_id']               = options[:tenant_id]
+            ike_policy['auth_algorithm']          = options[:auth_algorithm]
+            ike_policy['encryption_algorithm']    = options[:encryption_algorithm]
+            ike_policy['pfs']                     = options[:pfs]
+            ike_policy['phase1_negotiation_mode'] = options[:phase1_negotiation_mode]
+            ike_policy['lifetime']                = options[:lifetime]
+            ike_policy['ike_version']             = options[:ike_version]
+            response.body = {'ikepolicy' => ike_policy}
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_ipsec_policy.rb

@@ -0,0 +1,52 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def update_ipsec_policy(ipsec_policy_id, options = {})
+          data = {'ipsecpolicy' => {}}
+
+          vanilla_options = [:name, :description, :tenant_id,
+                             :auth_algorithm, :encryption_algorithm,
+                             :pfs, :transform_protocol, :encapsulation_mode,
+                             :lifetime, :ipsec_version
+                            ]
+          vanilla_options.select { |o| options.key?(o) }.each do |key|
+            data['ipsecpolicy'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "vpn/ipsecpolicies/#{ipsec_policy_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_ipsec_policy(ipsec_policy_id, options = {})
+          response = Excon::Response.new
+          ipsec_policy = list_ipsec_policies.body['ipsecpolicies'].detect do |instance|
+            instance['id'] == ipsec_policy_id
+          end
+          if ipsec_policy
+            ipsec_policy['name']                 = options[:name]
+            ipsec_policy['description']          = options[:description]
+            ipsec_policy['tenant_id']            = options[:tenant_id]
+            ipsec_policy['auth_algorithm']       = options[:auth_algorithm]
+            ipsec_policy['encryption_algorithm'] = options[:encryption_algorithm]
+            ipsec_policy['pfs']                  = options[:pfs]
+            ipsec_policy['transform_protocol']   = options[:transform_protocol]
+            ipsec_policy['encapsulation_mode']   = options[:encapsulation_mode]
+            ipsec_policy['lifetime']             = options[:lifetime]
+            response.body = {'ipsecpolicy' => ipsec_policy}
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_ipsec_site_connection.rb

@@ -0,0 +1,64 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def update_ipsec_site_connection(ipsec_site_connection_id, options = {})
+          data = {'ipsec_site_connection' => {}}
+
+          vanilla_options = [:name, :description, :tenant_id,
+                             :peer_address, :peer_id, :peer_cidrs,
+                             :psk, :mtu, :dpd, :initiator,
+                             :admin_state_up, :ikepolicy_id,
+                             :ipsecpolicy_id, :vpnservice_id
+                            ]
+          vanilla_options.select { |o| options.key?(o) }.each do |key|
+            data['ipsec_site_connection'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "vpn/ipsec-site-connections/#{ipsec_site_connection_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_ipsec_site_connection(ipsec_site_connection_id, options = {})
+          response = Excon::Response.new
+          ipsec_site_connection = list_ipsec_site_connections.body['ipsec_site_connections'].detect do |instance|
+            instance['id'] == ipsec_site_connection_id
+          end
+          if ipsec_site_connection
+            ipsec_site_connection['name']              = options[:name]
+            ipsec_site_connection['description']       = options[:description]
+            ipsec_site_connection['tenant_id']         = options[:tenant_id]
+            ipsec_site_connection['status']            = 'ACTIVE'
+            ipsec_site_connection['admin_state_up']    = options[:admin_state_up]
+            ipsec_site_connection['psk']               = options[:psk]
+            ipsec_site_connection['initiator']         = options[:initiator]
+            ipsec_site_connection['auth_mode']         = "psk"
+            ipsec_site_connection['peer_cidrs']        = options[:peer_cidrs]
+            ipsec_site_connection['mtu']               = options[:mtu]
+            ipsec_site_connection['peer_ep_group_id']  = Fog::Mock.random_numbers(6).to_s
+            ipsec_site_connection['ikepolicy_id']      = options[:ikepolicy_id] || 'ike'
+            ipsec_site_connection['vpnservice_id']     = options[:vpnservice_id] || 'vpn'
+            ipsec_site_connection['dpd']               = options[:dpd]
+            ipsec_site_connection['route_mode']        = "static"
+            ipsec_site_connection['ipsecpolicy_id']    = options[:ipsecpolicy_id] || 'ipsec'
+            ipsec_site_connection['local_ep_group_id'] = Fog::Mock.random_numbers(6).to_s
+            ipsec_site_connection['peer_address']      = options[:peer_address]
+            ipsec_site_connection['peer_id']           = options[:peer_id]
+
+            response.body = {'ipsec_site_connection' => ipsec_site_connection}
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_vpn_service.rb

@@ -0,0 +1,46 @@
+module Fog
+  module Network
+    class OpenStack
+      class Real
+        def update_vpn_service(vpn_service_id, options = {})
+          data = {'vpnservice' => {}}
+
+          vanilla_options = [:name, :description, :admin_state_up]
+          vanilla_options.select { |o| options.key?(o) }.each do |key|
+            data['vpnservice'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "vpn/vpnservices/#{vpn_service_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_vpn_service(vpn_service_id, options = {})
+          response = Excon::Response.new
+          if vpn_service = list_vpn_services.body['vpnservices'].detect { |instance| instance['id'] == vpn_service_id }
+            vpn_service['id']             = vpn_service_id
+            vpn_service['subnet_id']      = options[:subnet_id]
+            vpn_service['router_id']      = options[:router_id]
+            vpn_service['name']           = options[:name]
+            vpn_service['description']    = options[:description]
+            vpn_service['status']         = 'ACTIVE'
+            vpn_service['admin_state_up'] = options[:admin_state_up]
+            vpn_service['tenant_id']      = options[:tenant_id]
+            vpn_service['external_v4_ip'] = '1.2.3.4'
+            vpn_service['external_v6_ip'] = '::1'
+            response.body = {'vpnservice' => vpn_service}
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/storage.rb

@@ -6,10 +6,10 @@ module Fog
       requires   :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url,
                  :persistent, :openstack_service_type, :openstack_service_name,
-                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_tenant, :openstack_tenant_id, :openstack_userid,
                  :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
                  :current_user, :current_tenant, :openstack_region,
-                 :openstack_endpoint_type,
+                 :openstack_endpoint_type, :openstack_auth_omit_default_port,
                  :openstack_project_name, :openstack_project_id,
                  :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
                  :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/tests/helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require File.expand_path('../../lib/fog/openstack', __FILE__)
 
 Bundler.require(:test)

data/tests/openstack/models/network/ike_policies_tests.rb

@@ -0,0 +1,28 @@
+Shindo.tests("Fog::Network[:openstack] | ike_policies", ['openstack']) do
+  @ike_policy = Fog::Network[:openstack].ike_policies.create(:name                    => 'test-ike-policy',
+                                                             :description             => 'Test VPN IKE Policy',
+                                                             :tenant_id               => 'tenant_id',
+                                                             :auth_algorithm          => 'sha1',
+                                                             :encryption_algorithm    => 'aes-256',
+                                                             :pfs                     => 'group5',
+                                                             :phase1_negotiation_mode => 'main',
+                                                             :lifetime                => {
+                                                               'units' => 'seconds',
+                                                               'value' => 3600
+                                                             },
+                                                             :ike_version             => 'v1')
+
+  @ike_policies = Fog::Network[:openstack].ike_policies
+
+  tests('success') do
+    tests('#all').succeeds do
+      @ike_policies.all
+    end
+
+    tests('#get').succeeds do
+      @ike_policies.get(@ike_policy.id)
+    end
+  end
+
+  @ike_policy.destroy
+end