fog-openstack 0.1.12 → 0.1.13

data/lib/fog/dns/openstack/v2/requests/list_zones.rb

@@ -4,11 +4,14 @@ module Fog
       class V2
         class Real
           def list_zones(options = {})
+            headers, options = Fog::DNS::OpenStack::V2.setup_headers(options)
+
             request(
               :expects => 200,
               :method  => 'GET',
               :path    => 'zones',
-              :query   => options
+              :query   => options,
+              :headers => headers
             )
           end
         end

data/lib/fog/dns/openstack/v2/requests/update_quota.rb

@@ -4,13 +4,14 @@ module Fog
       class V2
         class Real
           def update_quota(project_id, options = {})
-            all_projects = options.key?(:all_projects) ? options.delete(:all_projects) : false
+            headers, options = Fog::DNS::OpenStack::V2.setup_headers(options)
+
             request(
-              :headers => {"X-Auth-All-Projects" => all_projects},
               :body    => Fog::JSON.encode(options),
               :expects => 200,
               :method  => 'PATCH',
-              :path    => "quotas/#{project_id}"
+              :path    => "quotas/#{project_id}",
+              :headers => headers
             )
           end
         end

data/lib/fog/dns/openstack/v2/requests/update_recordset.rb

@@ -4,11 +4,14 @@ module Fog
       class V2
         class Real
           def update_recordset(zone_id, id, options = {})
+            headers, options = Fog::DNS::OpenStack::V2.setup_headers(options)
+
             request(
               :body    => Fog::JSON.encode(options),
               :expects => 202,
               :method  => 'PUT',
-              :path    => "zones/#{zone_id}/recordsets/#{id}"
+              :path    => "zones/#{zone_id}/recordsets/#{id}",
+              :headers => headers
             )
           end
         end

data/lib/fog/dns/openstack/v2/requests/update_zone.rb

@@ -4,11 +4,14 @@ module Fog
       class V2
         class Real
           def update_zone(id, options = {})
+            headers, options = Fog::DNS::OpenStack::V2.setup_headers(options)
+
             request(
               :body    => Fog::JSON.encode(options),
               :expects => 202,
               :method  => 'PATCH',
-              :path    => "zones/#{id}"
+              :path    => "zones/#{id}",
+              :headers => headers
             )
           end
         end

data/lib/fog/introspection/openstack.rb

@@ -43,7 +43,7 @@ module Fog
         def self.data
           @data ||= Hash.new do |hash, key|
             # Introspection data is *huge* we load it from a yaml file
-            file = "../../../../tests/fixtures/introspection.yaml"
+            file = "../../../../test/fixtures/introspection.yaml"
             hash[key] = YAML.load(File.read(File.expand_path(file, __FILE__)))
           end
         end
@@ -80,7 +80,7 @@ module Fog
         def initialize(options = {})
           initialize_identity options
 
-          @openstack_service_type  = options[:openstack_service_type] || ['introspection']
+          @openstack_service_type  = options[:openstack_service_type] || ['baremetal-introspection']
           @openstack_service_name  = options[:openstack_service_name]
 
           @connection_options = options[:connection_options] || {}
@@ -94,12 +94,7 @@ module Fog
 
         def set_api_path
           unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(
-              SUPPORTED_VERSIONS,
-              @openstack_management_uri,
-              @auth_token,
-              @connection_options
-            )
+            @path = "/v1"
           end
         end
       end

data/lib/fog/monitoring/openstack.rb

@@ -31,6 +31,7 @@ module Fog
       collection  :alarm_states
       model       :alarm_count
       collection  :alarm_counts
+      model       :dimension_value
 
       request_path 'fog/monitoring/openstack/requests'
       request :create_metric
@@ -45,7 +46,8 @@ module Fog
       request :create_notification_method
       request :get_notification_method
       request :list_notification_methods
-      request :update_notification_method
+      request :put_notification_method
+      request :patch_notification_method
       request :delete_notification_method
 
       request :create_alarm_definition
@@ -65,6 +67,10 @@ module Fog
       request :list_alarm_state_history_for_specific_alarm
       request :list_alarm_state_history_for_all_alarms
 
+      request :list_dimension_values
+
+      request :list_notification_method_types
+
       class Real
         include Fog::OpenStack::Core
 

data/lib/fog/monitoring/openstack/models/alarm.rb

@@ -6,7 +6,6 @@ module Fog
       class Alarm < Fog::OpenStack::Model
         identity :id
 
-        attribute :name
         attribute :links
         attribute :link
         attribute :alarm_definition

data/lib/fog/monitoring/openstack/models/alarm_definition.rb

@@ -10,6 +10,7 @@ module Fog
         attribute :name
         attribute :description
         attribute :expression
+        attribute :deterministic
         attribute :expression_data
         attribute :match_by
         attribute :severity

data/lib/fog/monitoring/openstack/models/dimension_value.rb

@@ -0,0 +1,19 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class DimensionValue < Fog::OpenStack::Model
+        identity :id
+
+        attribute :metric_name
+        attribute :dimension_name
+        attribute :values
+
+        def to_s
+          name
+        end
+      end
+    end
+  end
+end

data/lib/fog/monitoring/openstack/models/dimension_values.rb

@@ -0,0 +1,16 @@
+require 'fog/openstack/models/collection'
+require 'fog/monitoring/openstack/models/dimension_value'
+
+module Fog
+  module Monitoring
+    class OpenStack
+      class DimensionValues < Fog::OpenStack::Collection
+        model Fog::Monitoring::OpenStack::DimensionValue
+
+        def all(dimension_name, options = {})
+          load_response(service.list_dimension_values(dimension_name, options), 'elements')
+        end
+      end
+    end
+  end
+end

data/lib/fog/monitoring/openstack/models/metrics.rb

@@ -1,5 +1,6 @@
 require 'fog/openstack/models/collection'
 require 'fog/monitoring/openstack/models/metric'
+require 'fog/monitoring/openstack/models/dimension_values'
 
 module Fog
   module Monitoring
@@ -22,6 +23,13 @@ module Fog
         def create_metric_array(metrics_list = [])
           service.create_metric_array(metrics_list)
         end
+
+        def list_dimension_values(dimension_name, options = {})
+          dimension_value = Fog::Monitoring::OpenStack::DimensionValues.new
+          dimension_value.load_response(
+            service.list_dimension_values(dimension_name, options), 'elements'
+          )
+        end
       end
     end
   end

data/lib/fog/monitoring/openstack/models/notification_method.rb

@@ -10,6 +10,7 @@ module Fog
         attribute :links
         attribute :type
         attribute :address
+        attribute :period
 
         def create
           requires :name, :type, :address
@@ -21,7 +22,13 @@ module Fog
         def update(attr = nil)
           requires :name, :type, :address
           merge_attributes(
-            service.update_notification_method(id, attr || attributes).body
+            service.put_notification_method(id, attr || attributes).body
+          )
+        end
+
+        def patch(attr = nil)
+          merge_attributes(
+            service.patch_notification_method(id, attr || attributes).body
           )
         end
 

data/lib/fog/monitoring/openstack/models/notification_methods.rb

@@ -28,6 +28,10 @@ module Fog
           )
         end
 
+        def list_types
+          service.list_notification_method_types.body['elements'].map { |x| x['type'].to_sym }
+        end
+
         def destroy(id)
           notification_method = find_by_id(id)
           notification_method.destroy

data/lib/fog/monitoring/openstack/requests/list_dimension_values.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Monitoring
+    class OpenStack
+      class Real
+        def list_dimension_values(dimension_name, options = {})
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "metrics/dimensions/names/values",
+            :query   => options.merge(:dimension_name => dimension_name)
+          )
+        end
+      end
+
+      class Mock
+        # def list_dimension_values(dimension_name, options = {})
+        # end
+      end
+    end
+  end
+end

data/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Monitoring
+    class OpenStack
+      class Real
+        def list_notification_method_types
+          request(
+            :expects => [200],
+            :method  => 'GET',
+            :path    => "notification-methods/types"
+          )
+        end
+      end
+
+      class Mock
+        # def list_notification_method_types
+        #
+        # end
+      end
+    end
+  end
+end

data/lib/fog/monitoring/openstack/requests/{update_notification_method.rb → patch_notification_method.rb}

@@ -5,7 +5,7 @@ module Fog
         def update_notification_method(id, notification)
           request(
             :expects => [200],
-            :method  => 'PUT',
+            :method  => 'PATCH',
             :path    => "notification-methods/#{id}",
             :body    => Fog::JSON.encode(notification)
           )

data/lib/fog/monitoring/openstack/requests/put_notification_method.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Monitoring
+    class OpenStack
+      class Real
+        def put_notification_method(id, notification)
+          request(
+            :expects => [200],
+            :method  => 'PUT',
+            :path    => "notification-methods/#{id}",
+            :body    => Fog::JSON.encode(notification)
+          )
+        end
+      end
+
+      class Mock
+      end
+    end
+  end
+end

data/lib/fog/network/openstack.rb

@@ -185,6 +185,7 @@ module Fog
       class Mock
         def self.data
           @data ||= Hash.new do |hash, key|
+            qos_policy_id = Fog::UUID.uuid
             network_id = Fog::UUID.uuid
             subnet_id  = Fog::UUID.uuid
             tenant_id  = Fog::Mock.random_hex(8)
@@ -198,18 +199,21 @@ module Fog
                   'shared'                => true,
                   'status'                => 'ACTIVE',
                   'tenant_id'             => tenant_id,
-                  'provider_network_type' => 'vlan',
+                  'provider:network:type' => 'vlan',
                   'router:external'       => false,
                   'admin_state_up'        => true,
+                  'qos_policy_id'         => qos_policy_id,
+                  'port_security_enabled' => 'port_security_enabled'
                 },
                 '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',
+                  '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',
+                  'router:external' => false,
                 }
               },
               :ports                  => {},

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

@@ -2,48 +2,57 @@ module Fog
   module Network
     class OpenStack
       class Real
-        def create_network(options = {})
-          data = {'network' => {}}
+        CREATE_OPTIONS = [
+          :name,
+          :shared,
+          :admin_state_up,
+          :qos_policy_id,
+          :port_security_enabled,
+          :tenant_id,
+        ].freeze
 
-          vanilla_options = [
-            :name,
-            :shared,
-            :admin_state_up,
-            :tenant_id
-          ]
+        # Advanced Features through API Extensions
+        #
+        # Not strictly required but commonly found in OpenStack
+        # installs with Quantum networking.
+        #
+        # @see http://docs.openstack.org/trunk/openstack-network/admin/content/provider_attributes.html
 
-          vanilla_options.reject { |o| options[o].nil? }.each do |key|
-            data['network'][key] = options[key]
-          end
+        EXTENTED_OPTIONS = [
+          :provider_network_type,
+          :provider_segmentation_id,
+          :provider_physical_network,
+          :router_external,
+        ].freeze
 
-          # Advanced Features through API Extensions
-          #
-          # Not strictly required but commonly found in OpenStack
-          # installs with Quantum networking.
-          #
-          # @see http://docs.openstack.org/trunk/openstack-network/admin/content/provider_attributes.html
-          provider_options = [
-            :router_external,
-            :provider_network_type,
-            :provider_segmentation_id,
-            :provider_physical_network
-          ]
+        # Map Fog::Network::OpenStack::Network
+        # model attributes to OpenStack provider attributes
+        ALIASES = {
+          :provider_network_type     => 'provider:network_type',
 
-          # Map Fog::Network::OpenStack::Network
-          # model attributes to OpenStack provider attributes
-          aliases = {
-            :provider_network_type     => 'provider:network_type',
-            # Not applicable to the "local" or "gre" network types
-            :provider_physical_network => 'provider:physical_network',
-            :provider_segmentation_id  => 'provider:segmentation_id',
-            :router_external           => 'router:external'
-          }
+          # Not applicable to the "local" or "gre" network types
+          :provider_physical_network => 'provider:physical_network',
+          :provider_segmentation_id  => 'provider:segmentation_id',
+
+          :router_external           => 'router:external'
+        }.freeze
 
-          provider_options.reject { |o| options[o].nil? }.each do |key|
-            aliased_key = aliases[key] || key
-            data['network'][aliased_key] = options[key]
+        def self.create(options)
+          data = {}
+          CREATE_OPTIONS.reject { |o| options[o].nil? }.each do |key|
+            data[key.to_s] = options[key]
+          end
+
+          EXTENTED_OPTIONS.reject { |o| options[o].nil? }.each do |key|
+            aliased_key = ALIASES[key] || key
+            data[aliased_key] = options[key]
           end
+          data
+        end
 
+        def create_network(options = {})
+          data = {}
+          data['network'] = self.class.create(options)
           request(
             :body    => Fog::JSON.encode(data),
             :expects => [201],
@@ -58,35 +67,17 @@ module Fog
           response = Excon::Response.new
           response.status = 201
           data = {
-            'id'             => Fog::Mock.random_numbers(6).to_s,
-            'name'           => options[:name],
-            'shared'         => options[:shared],
-            'subnets'        => [],
-            'status'         => 'ACTIVE',
-            'admin_state_up' => options[:admin_state_up],
-            'tenant_id'      => options[:tenant_id],
-          }
-
-          # Add provider specific attributes when found
-          #
-          provider_options = [
-            :router_external,
-            :provider_network_type,
-            :provider_segmentation_id,
-            :provider_physical_network
-          ]
-          aliases = {
-            :provider_network_type     => 'provider:network_type',
-            # Not applicable to the "local" or "gre" network types
-            :provider_physical_network => 'provider:physical_network',
-            :provider_segmentation_id  => 'provider:segmentation_id',
-            :router_external           => 'router:external'
+            'id'                    => Fog::Mock.random_numbers(6).to_s,
+            'name'                  => options[:name],
+            'shared'                => options[:shared],
+            'subnets'               => [],
+            'status'                => 'ACTIVE',
+            'admin_state_up'        => options[:admin_state_up],
+            'tenant_id'             => options[:tenant_id],
+            'qos_policy_id'         => options[:qos_policy_id],
+            'port_security_enabled' => options[:port_security_enabled]
           }
-          provider_options.reject { |o| options[o].nil? }.each do |key|
-            aliased_key = aliases[key] || key
-            data[aliased_key] = options[key]
-          end
-
+          data.merge!(Fog::Network::OpenStack::Real.create(options))
           self.data[:networks][data['id']] = data
           response.body = {'network' => data}
           response