fog-openstack 0.1.1 → 0.1.2

data/lib/fog/openstack/models/network/ipsec_site_connection.rb

@@ -0,0 +1,51 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class IpsecSiteConnection < Fog::OpenStack::Model
+        identity :id
+
+        attribute :name
+        attribute :description
+        attribute :status
+        attribute :admin_state_up
+        attribute :tenant_id
+        attribute :vpnservice_id
+        attribute :ikepolicy_id
+        attribute :ipsecpolicy_id
+        attribute :peer_address
+        attribute :peer_id
+        attribute :peer_cidrs
+        attribute :psk
+        attribute :mtu
+        attribute :dpd
+        attribute :initiator
+
+        def create
+          requires :name, :vpnservice_id, :ikepolicy_id, :ipsecpolicy_id,
+                   :peer_address, :peer_id, :peer_cidrs, :psk
+          merge_attributes(service.create_ipsec_site_connection(vpnservice_id,
+                                                                ikepolicy_id,
+                                                                ipsecpolicy_id,
+                                                                attributes).body['ipsec_site_connection'])
+          self
+        end
+
+        def update
+          requires :id, :name, :vpnservice_id, :ikepolicy_id, :ipsecpolicy_id,
+                   :peer_address, :peer_id, :peer_cidrs, :psk
+          merge_attributes(service.update_ipsec_site_connection(id,
+                                                                attributes).body['ipsec_site_connection'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_ipsec_site_connection(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/ipsec_site_connections.rb

@@ -0,0 +1,33 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/network/ipsec_site_connection'
+
+module Fog
+  module Network
+    class OpenStack
+      class IpsecSiteConnections < Fog::OpenStack::Collection
+        attribute :filters
+
+        model Fog::Network::OpenStack::IpsecSiteConnection
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters_arg = filters)
+          filters = filters_arg
+          load_response(service.list_ipsec_site_connections(filters), 'ipsec_site_connections')
+        end
+
+        def get(ipsec_site_connection_id)
+          connection = service.get_ipsec_site_connection(ipsec_site_connection_id).body['ipsec_site_connection']
+          if connection
+            new(connection)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/vpn_service.rb

@@ -0,0 +1,42 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class VpnService < Fog::OpenStack::Model
+        identity :id
+
+        attribute :subnet_id
+        attribute :router_id
+        attribute :name
+        attribute :description
+        attribute :status
+        attribute :admin_state_up
+        attribute :tenant_id
+        attribute :external_v4_ip
+        attribute :external_v6_ip
+
+        def create
+          requires :subnet_id, :router_id, :name, :admin_state_up
+          merge_attributes(service.create_vpn_service(subnet_id,
+                                                      router_id,
+                                                      attributes).body['vpnservice'])
+          self
+        end
+
+        def update
+          requires :id, :subnet_id, :router_id, :name, :admin_state_up
+          merge_attributes(service.update_vpn_service(id,
+                                                      attributes).body['vpnservice'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_vpn_service(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/vpn_services.rb

@@ -0,0 +1,32 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/network/vpn_service'
+
+module Fog
+  module Network
+    class OpenStack
+      class VpnServices < Fog::OpenStack::Collection
+        attribute :filters
+
+        model Fog::Network::OpenStack::VpnService
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters_arg = filters)
+          filters = filters_arg
+          load_response(service.list_vpn_services(filters), 'vpnservices')
+        end
+
+        def get(vpn_service_id)
+          if vpn_service = service.get_vpn_service(vpn_service_id).body['vpnservice']
+            new(vpn_service)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/network.rb

@@ -1,4 +1,4 @@
-require 'fog/openstack/core'
+
 
 module Fog
   module Network
@@ -38,6 +38,14 @@ module Fog
       collection  :lb_health_monitors
       model       :lb_vip
       collection  :lb_vips
+      model       :vpn_service
+      collection  :vpn_services
+      model       :ike_policy
+      collection  :ike_policies
+      model       :ipsec_policy
+      collection  :ipsec_policies
+      model       :ipsec_site_connection
+      collection  :ipsec_site_connections
       model       :security_group
       collection  :security_groups
       model       :security_group_rule
@@ -116,6 +124,34 @@ module Fog
       request :get_lb_vip
       request :update_lb_vip
 
+      # VPNaaS VPN Service CRUD
+      request :list_vpn_services
+      request :create_vpn_service
+      request :delete_vpn_service
+      request :get_vpn_service
+      request :update_vpn_service
+
+      # VPNaaS VPN IKE Policy CRUD
+      request :list_ike_policies
+      request :create_ike_policy
+      request :delete_ike_policy
+      request :get_ike_policy
+      request :update_ike_policy
+
+      # VPNaaS VPN IPSec Policy CRUD
+      request :list_ipsec_policies
+      request :create_ipsec_policy
+      request :delete_ipsec_policy
+      request :get_ipsec_policy
+      request :update_ipsec_policy
+
+      # VPNaaS VPN IPSec Site Connection CRUD
+      request :list_ipsec_site_connections
+      request :create_ipsec_site_connection
+      request :delete_ipsec_site_connection
+      request :get_ipsec_site_connection
+      request :update_ipsec_site_connection
+
       # Security Group
       request :create_security_group
       request :delete_security_group
@@ -146,7 +182,7 @@ module Fog
 
             hash[key] = {
               :networks => {
-                network_id => {
+                network_id                             => {
                   'id'                    => network_id,
                   'name'                  => 'Public',
                   'subnets'               => [subnet_id],
@@ -156,6 +192,15 @@ module Fog
                   'provider_network_type' => 'vlan',
                   'router:external'       => false,
                   'admin_state_up'        => true,
+                },
+                'e624a36d-762b-481f-9b50-4154ceb78bbb' => {
+                  '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',
                 }
               },
               :ports => {},
@@ -174,22 +219,16 @@ module Fog
                   'tenant_id'        => tenant_id,
                 }
               },
-              :floating_ips => {
-                '00000000-0000-0000-0000-000000000000' => {
-                  'id'               => '00000000-0000-0000-0000-000000000000',
-                  'port_id'             => nil,
-                  'tenant_id'           => tenant_id,
-                  'floating_network_id'    => network_id,
-                  'router_id'           => '00000000-0000-0000-0000-000000000000',
-                  'floating_ip_address' => '66.66.66.66',
-
-                }
-              },
+              :floating_ips => {},
               :routers => {},
               :lb_pools => {},
               :lb_members => {},
               :lb_health_monitors => {},
               :lb_vips => {},
+              :vpn_services           => {},
+              :ike_policies           => {},
+              :ipsec_policies         => {},
+              :ipsec_site_connections => {},
               :quota => {
                 "subnet" => 10,
                 "router" => 10,

data/lib/fog/openstack/requests/compute/create_volume.rb

@@ -1,8 +1,10 @@
+#
 module Fog
   module Compute
     class OpenStack
+      #
       class Real
-        def create_volume(name, description, size, options={})
+        def create_volume(name, description, size, options = {})
           data = {
             'volume' => {
               'display_name'        => name,
@@ -11,38 +13,43 @@ module Fog
             }
           }
 
-          vanilla_options = [:snapshot_id, :availability_zone]
-          vanilla_options.select{|o| options[o]}.each do |key|
+          vanilla_options = [
+            :snapshot_id,
+            :availability_zone,
+            :volume_type,
+            :metadata]
+
+          vanilla_options.select { |o| options[o] }.each do |key|
             data['volume'][key] = options[key]
           end
+
           request(
-            :body     => Fog::JSON.encode(data),
-            :expects  => [200, 202],
-            :method   => 'POST',
-            :path     => "os-volumes"
+            :body    => Fog::JSON.encode(data),
+            :expects => [200, 202],
+            :method  => 'POST',
+            :path    => 'os-volumes'
           )
         end
       end
 
+      #
       class Mock
-        def create_volume(name, description, size, options={})
+        def create_volume(name, description, size, options = {})
           response = Excon::Response.new
           response.status = 202
-          data = {
-            'id'                  => Fog::Mock.random_numbers(2),
-            'displayName'         => name,
-            'displayDescription'  => description,
-            'size'                => size,
-            'status'              => 'creating',
-            'snapshotId'          => options[:snapshot_id],
-            'volumeType'          => 'None',
-            'availabilityZone'    => options[:availability_zone] || 'nova',
-            'createdAt'           => Time.now.strftime('%FT%T.%6N'),
-            'attachments'         => [],
-            'metadata'            => {}
+          data = {'id' => Fog::Mock.random_numbers(2),
+                  'displayName' => name,
+                  'displayDescription' => description,
+                  'size' => size,
+                  'status' => 'creating',
+                  'snapshotId' => options[:snapshot_id],
+                  'volumeType' => options[:volume_type] || 'None',
+                  'availabilityZone' => options[:availability_zone] || 'nova',
+                  'createdAt' => Time.now.strftime('%FT%T.%6N'),
+                  'attachments' => [], 'metadata' => options[:metadata] || {}
           }
           self.data[:volumes][data['id']] = data
-          response.body = { 'volume' => data }
+          response.body = {'volume' => data}
           response
         end
       end

data/lib/fog/openstack/requests/metering/get_event.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Metering
+    class OpenStack
+      class Real
+        def get_event(message_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "events/#{message_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_event(message_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'event_type'=>'compute.instance.create',
+            'message_id'=>'d646b40dea6347dfb8caee2da1484c56',
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/metering/list_events.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Metering
+    class OpenStack
+      class Real
+        def list_events(options=[])
+          data = {
+            'q' => Array.new
+          }
+
+          options.each do |opt|
+            filter = {}
+
+            ['field', 'op', 'value'].each do |key|
+              filter[key] = opt[key] if opt[key]
+            end
+
+            data['q'] << filter unless filter.empty?
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'events'
+          )
+        end
+      end
+
+      class Mock
+        def list_events(options={})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = [{
+            'event_type'=>'compute.instance.create',
+            'message_id'=>'d646b40dea6347dfb8caee2da1484c56',
+          }]
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -25,16 +25,21 @@ module Fog
 
       class Mock
         def associate_floating_ip(floating_ip_id, port_id, options = {})
-          if data = self.data[:floating_ips][floating_ip_id]
-            response = Excon::Response.new
-            response.status = 201
-            data['port_id'] = port_id
-            data['fixed_ip_address'] = options[:fixed_ip_address]
-            response.body = { 'floatingip' => data }
-            response
-          else
-            raise Fog::Network::OpenStack::NotFound
-          end
+          response = Excon::Response.new
+          response.status = 201
+          data = {
+            'id'                  => '00000000-0000-0000-0000-000000000000',
+            'router_id'           => '00000000-0000-0000-0000-000000000000',
+            'tenant_id'           => options["tenant_id"],
+            'floating_network_id' => options["floating_network_id"],
+            'fixed_ip_address'    => options["fixed_ip_address"],
+            'floating_ip_address' => options["floating_ip_address"],
+            'port_id'             => port_id,
+          }
+
+          self.data[:floating_ips][data['floating_ip_id']] = data
+          response.body = { 'floatingip' => data }
+          response
         end
       end
     end