fog 1.32.0 → 1.33.0

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/port'
 
 module Fog
   module Network
     class OpenStack
-      class Ports < Fog::Collection
+      class Ports < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::Port
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_ports(filters).body['ports'])
+          load_response(service.list_ports(filters), 'ports')
         end
 
-        alias_method :summary, :all
-
         def get(port_id)
           if port = service.get_port(port_id).body['port']
             new(port)

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

@@ -1,4 +1,4 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
@@ -10,7 +10,7 @@ module Fog
       # an appropriate external gateway.
       #
       # @see http://docs.openstack.org/api/openstack-network/2.0/content/router_ext.html
-      class Router < Fog::Model
+      class Router < Fog::OpenStack::Model
         identity :id
 
         attribute :name
@@ -19,17 +19,6 @@ module Fog
         attribute :external_gateway_info
         attribute :status
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :name
-          identity ? update : create
-        end
-
         def create
           requires :name
 

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/router'
 
 module Fog
   module Network
     class OpenStack
-      class Routers < Fog::Collection
+      class Routers < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::Router
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_routers(filters).body['routers'])
+          load_response(service.list_routers(filters), 'routers')
         end
 
-        alias_method :summary, :all
-
         def get(router_id)
           if router = service.get_router(router_id).body['router']
             new(router)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class SecurityGroup < Fog::Model
+      class SecurityGroup < Fog::OpenStack::Model
         identity :id
 
         attribute :name

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class SecurityGroupRule < Fog::Model
+      class SecurityGroupRule < Fog::OpenStack::Model
         identity :id
 
         attribute :security_group_id

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/security_group_rule'
 
 module Fog
   module Network
     class OpenStack
-      class SecurityGroupRules < Fog::Collection
+      class SecurityGroupRules < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::SecurityGroupRule
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_security_group_rules(filters).body['security_group_rules'])
+          load_response(service.list_security_group_rules(filters), 'security_group_rules')
         end
 
-        alias_method :summary, :all
-
         def get(sec_group_rule_id)
           if sec_group_rule = service.get_security_group_rule(sec_group_rule_id).body['security_group_rule']
             new(sec_group_rule)

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/security_group'
 
 module Fog
   module Network
     class OpenStack
-      class SecurityGroups < Fog::Collection
+      class SecurityGroups < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::SecurityGroup
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_security_groups(filters).body['security_groups'])
+          load_response(service.list_security_groups(filters), 'security_groups')
         end
 
-        alias_method :summary, :all
-
         def get(security_group_id)
           if security_group = service.get_security_group(security_group_id).body['security_group']
             new(security_group)

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

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Network
     class OpenStack
-      class Subnet < Fog::Model
+      class Subnet < Fog::OpenStack::Model
         identity :id
 
         attribute :name
@@ -17,17 +17,6 @@ module Fog
         attribute :enable_dhcp
         attribute :tenant_id
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
-        def save
-          requires :network_id, :cidr, :ip_version
-          identity ? update : create
-        end
-
         def create
           requires :network_id, :cidr, :ip_version
           merge_attributes(service.create_subnet(self.network_id,
@@ -38,7 +27,7 @@ module Fog
         end
 
         def update
-          requires :id, :network_id, :cidr, :ip_version
+          requires :id
           merge_attributes(service.update_subnet(self.id,
                                                     self.attributes).body['subnet'])
           self

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

@@ -1,10 +1,10 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/network/subnet'
 
 module Fog
   module Network
     class OpenStack
-      class Subnets < Fog::Collection
+      class Subnets < Fog::OpenStack::Collection
         attribute :filters
 
         model Fog::Network::OpenStack::Subnet
@@ -16,11 +16,9 @@ module Fog
 
         def all(filters_arg = filters)
           filters = filters_arg
-          load(service.list_subnets(filters).body['subnets'])
+          load_response(service.list_subnets(filters), 'subnets')
         end
 
-        alias_method :summary, :all
-
         def get(subnet_id)
           if subnet = service.get_subnet(subnet_id).body['subnet']
             new(subnet)

data/lib/fog/openstack/models/orchestration/event.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Orchestration
     class OpenStack
-      class Event < Fog::Model
+      class Event < Fog::OpenStack::Model
 
         include Reflectable
 

data/lib/fog/openstack/models/orchestration/events.rb

@@ -3,23 +3,21 @@ require 'fog/openstack/models/orchestration/event'
 module Fog
   module Orchestration
     class OpenStack
-      class Events < Fog::Collection
+      class Events < Fog::OpenStack::Collection
         model Fog::Orchestration::OpenStack::Event
 
         def all(options = {}, options_deprecated = {})
           data = if options.is_a?(Stack)
-                   service.list_stack_events(options, options_deprecated).body['events']
+                   service.list_stack_events(options, options_deprecated)
                  elsif options.is_a?(Hash)
-                   service.list_events(options).body['events']
+                   service.list_events(options)
                  else
-                   service.list_resource_events(options.stack, options, options_deprecated).body['events']
+                   service.list_resource_events(options.stack, options, options_deprecated)
                  end
 
-          load data
+          load_response(data, 'events')
         end
 
-        alias_method :summary, :all
-
         def get(stack, resource, event_id)
           data = service.show_event_details(stack, resource, event_id).body['event']
           new(data)

data/lib/fog/openstack/models/orchestration/resource.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Orchestration
     class OpenStack
-      class Resource < Fog::Model
+      class Resource < Fog::OpenStack::Model
 
         include Reflectable
 

data/lib/fog/openstack/models/orchestration/resource_schemas.rb

@@ -1,9 +1,9 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 
 module Fog
   module Orchestration
     class OpenStack
-      class ResourceSchemas < Fog::Collection
+      class ResourceSchemas < Fog::OpenStack::Collection
 
         def get(resource_type)
           service.show_resource_schema(resource_type).body

data/lib/fog/openstack/models/orchestration/resources.rb

@@ -3,7 +3,7 @@ require 'fog/openstack/models/orchestration/resource'
 module Fog
   module Orchestration
     class OpenStack
-      class Resources < Fog::Collection
+      class Resources < Fog::OpenStack::Collection
         model Fog::Orchestration::OpenStack::Resource
 
         def types
@@ -11,12 +11,10 @@ module Fog
         end
 
         def all(options = {}, deprecated_options = {})
-          data = service.list_resources(options, deprecated_options).body['resources']
-          load(data)
+          data = service.list_resources(options, deprecated_options)
+          load_response(data, 'resources')
         end
 
-        alias_method :summary, :all
-
         def get(resource_name, stack=nil)
           stack = self.first.stack if stack.nil?
           data  = service.show_resource_data(stack.stack_name, stack.id, resource_name).body['resource']

data/lib/fog/openstack/models/orchestration/stack.rb

@@ -1,7 +1,9 @@
+require 'fog/openstack/models/model'
+
 module Fog
   module Orchestration
     class OpenStack
-      class Stack < Fog::Model
+      class Stack < Fog::OpenStack::Model
 
         identity :id
 
@@ -11,12 +13,6 @@ module Fog
           attribute a.to_sym
         end
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def save(options={})
           if persisted?
             service.update_stack(self, default_options.merge(options)).body['stack']

data/lib/fog/openstack/models/orchestration/stacks.rb

@@ -3,20 +3,20 @@ require 'fog/openstack/models/orchestration/stack'
 module Fog
   module Orchestration
     class OpenStack
-      class Stacks < Fog::Collection
+      class Stacks < Fog::OpenStack::Collection
         model Fog::Orchestration::OpenStack::Stack
 
         def all(options = {})
           # TODO(lsmola) we can uncomment this when https://bugs.launchpad.net/heat/+bug/1468318 is fixed, till then
           # we will use non detailed list
           # data = service.list_stack_data_detailed(options).body['stacks']
-          data = service.list_stack_data(options).body['stacks']
-          load(data)
+          data = service.list_stack_data(options)
+          load_response(data, 'stacks')
         end
 
         def summary(options = {})
-          data = service.list_stack_data(options).body['stacks']
-          load(data)
+          data = service.list_stack_data(options)
+          load_response(data, 'stacks')
         end
 
         # Deprecated

data/lib/fog/openstack/models/orchestration/template.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Orchestration
     class OpenStack
-      class Template < Fog::Model
+      class Template < Fog::OpenStack::Model
 
         %w{format description template_version parameters resources content}.each do |a|
           attribute a.to_sym

data/lib/fog/openstack/models/orchestration/templates.rb

@@ -3,7 +3,7 @@ require 'fog/openstack/models/orchestration/template'
 module Fog
   module Orchestration
     class OpenStack
-      class Templates < Fog::Collection
+      class Templates < Fog::OpenStack::Collection
         model Fog::Orchestration::OpenStack::Template
 
         def get(obj)

data/lib/fog/openstack/models/planning/plan.rb

@@ -1,9 +1,9 @@
-require 'fog/core/model'
+require 'fog/openstack/models/model'
 
 module Fog
   module Openstack
     class Planning
-      class Plan < Fog::Model
+      class Plan < Fog::OpenStack::Model
 
         MASTER_TEMPLATE_NAME = 'plan.yaml'
         ENVIRONMENT_NAME = 'environment.yaml'
@@ -17,12 +17,6 @@ module Fog
         attribute :updated_at
         attribute :parameters
 
-        def initialize(attributes)
-          # Old 'connection' is renamed as service and should be used instead
-          prepare_service_value(attributes)
-          super
-        end
-
         def templates
           service.get_plan_templates(uuid).body
         end
@@ -59,11 +53,6 @@ module Fog
           true
         end
 
-        def save
-          requires :name
-          identity ? update : create
-        end
-
         def create
           requires :name
           merge_attributes(service.create_plan(self.attributes).body)

data/lib/fog/openstack/models/planning/plans.rb

@@ -1,18 +1,16 @@
-require 'fog/core/collection'
+require 'fog/openstack/models/collection'
 require 'fog/openstack/models/planning/plan'
 
 module Fog
   module Openstack
     class Planning
-      class Plans < Fog::Collection
+      class Plans < Fog::OpenStack::Collection
         model Fog::Openstack::Planning::Plan
 
         def all(options = {})
-          load(service.list_plans(options).body)
+          load_response(service.list_plans(options))
         end
 
-        alias_method :summary, :all
-
         def find_by_uuid(plan_uuid)
           new(service.get_plan(plan_uuid).body)
         end