fog 1.18.0 → 1.19.0

data/lib/fog/openstack/examples/compute/basics.rb

@@ -0,0 +1,74 @@
+# OpenStack Compute (Nova) Example
+
+require 'fog'
+
+auth_url = "https://example.net/v2.0/tokens"
+username = 'admin@example.net'
+password = 'secret'
+tenant   = 'My Compute Tenant' # String
+
+compute_client ||= ::Fog::Compute.new(:provider           => :openstack,
+                                      :openstack_api_key  => password  ,
+                                      :openstack_username => username  ,
+                                      :openstack_auth_url => auth_url  ,
+                                      :openstack_tenant   => tenant)
+
+# Create VM
+# Options include metadata, availability zone, etc...
+
+begin
+  vm = compute_client.servers.create(name, image, flavor, options = {})
+rescue => e
+  puts JSON.parse(e.response.body)['badRequest']['message']
+end
+
+# Destroy VM
+
+vm = compute_client.servers.get(vm.id) # Retrieve previously created vm by UUID
+floating_ips = vm.all_addresses # fetch and release its floating IPs
+floating_ips.each do |address|
+  compute_client.disassociate_address(uuid, address['ip'])
+  compute_client.release_address(address['id'])
+end
+vm.destroy
+
+# Power operations helper
+
+# vm.start / vm.stop / vm.pause should work after this
+class Server < Fog::Compute::Server
+  def start
+    if state.downcase == 'paused'
+      service.unpause_server(id) # resumes from frozen VM state
+    else
+      service.resume_server(id)  # resumes from hibernation
+    end
+  end
+
+  def stop
+    service.suspend_server(id) # hibernates the VM at hypervisor-level
+  end
+
+  def pause
+    service.pause_server(id)   # stores VM state in RAM
+  end
+end
+
+# Images available at tenant
+image_names = compute_client.images.map { |image| image['name'] }
+
+
+# Floating IP address pools available at tenant
+compute_client.addresses.get_address_pools
+# response.body #=> { 'name' => 'pool1' }, { 'name' => 'pool2' }
+
+# VNC console
+vm.console.body # returns VNC url
+
+# "console" => {
+#                "url"  => "http://vmvncserver:6080/vnc_auto.html?token=231",
+#                "type" => "novnc"
+#              }
+
+
+
+

data/lib/fog/openstack/identity.rb

@@ -95,7 +95,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'multi_json'
           @openstack_username = options[:openstack_username] || 'admin'
           @openstack_tenant   = options[:openstack_tenant]   || 'admin'
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -245,7 +244,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end
@@ -292,4 +291,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/openstack/image.rb

@@ -46,7 +46,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'multi_json'
           @openstack_username = options[:openstack_username]
           @openstack_tenant   = options[:openstack_tenant]
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -94,8 +93,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -167,7 +164,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/openstack/metering.rb

@@ -43,7 +43,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'multi_json'
           @openstack_username = options[:openstack_username]
           @openstack_tenant   = options[:openstack_tenant]
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -90,8 +89,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -165,7 +162,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

data/lib/fog/openstack/models/compute/host.rb

@@ -8,10 +8,12 @@ module Fog
       class Host < Fog::Model
 
         attribute :host_name
-        attribute :service
+        attribute :service_name
         attribute :details
+        attribute :zone
 
         def initialize(attributes)
+          attributes["service_name"] = attributes.delete "service"
           # Old 'connection' is renamed as service and should be used instead
           prepare_service_value(attributes)
           super
@@ -19,6 +21,8 @@ module Fog
 
         def details
           service.get_host_details(self.host_name).body['host']
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
         end
 
       end

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

@@ -3,16 +3,30 @@ require 'fog/core/model'
 module Fog
   module Compute
     class OpenStack
-
       class SecurityGroup < Fog::Model
 
         identity  :id
 
         attribute :name
         attribute :description
-        attribute :rules
+        attribute :security_group_rules, :aliases => "rules"
         attribute :tenant_id
 
+        def security_group_rules
+          Fog::Compute::OpenStack::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules])
+        end
+
+        def rules
+          Fog::Logger.deprecation('#rules is deprecated. Use #security_group_rules instead')
+          attributes[:security_group_rules]
+        end
+
+        # no one should be calling this because it doesn't do anything
+        # useful but we deprecated the rules attribute and need to maintain the API
+        def rules=(new_rules)
+          Fog::Logger.deprecation('#rules= is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.')
+          attributes[:security_group_rules] = new_rules
+        end
 
         def save
           requires :name, :description
@@ -21,7 +35,6 @@ module Fog
           true
         end
 
-
         def destroy
           requires :id
           service.delete_security_group(id)
@@ -29,15 +42,16 @@ module Fog
         end
 
         def create_security_group_rule(min, max, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id = nil)
+          Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.')
           requires :id
           service.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id)
         end
 
         def delete_security_group_rule(rule_id)
+          Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRule objects to destroy rules.')
           service.delete_security_group_rule(rule_id)
           true
         end
-
       end
     end
   end

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

@@ -0,0 +1,32 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class OpenStack
+      class SecurityGroupRule < Fog::Model
+        identity :id
+
+        attribute :from_port
+        attribute :group
+        attribute :ip_protocol
+        attribute :to_port
+        attribute :parent_group_id
+        attribute :ip_range
+
+        def save
+          requires :ip_protocol, :from_port, :to_port, :parent_group_id
+          cidr = ip_range && ip_range["cidr"]
+          if rule = service.create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group).data[:body]
+            merge_attributes(rule["security_group_rule"])
+          end
+        end
+
+        def destroy
+          requires :id
+          service.delete_security_group_rule(id)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/compute/security_group_rule'
+
+module Fog
+  module Compute
+    class OpenStack
+      class SecurityGroupRules < Fog::Collection
+
+        model Fog::Compute::OpenStack::SecurityGroupRule
+
+        def get(security_group_rule_id)
+          if security_group_rule_id
+            body = service.get_security_group_rule(security_group_rule_id).body
+            new(body['security_group_rule'])
+          end
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/volume_type.rb

@@ -0,0 +1,20 @@
+require 'fog/core/model'
+
+module Fog
+  module Volume
+    class OpenStack
+      class VolumeType < Fog::Model
+        identity :id
+
+        attribute :name
+        attribute :volume_backend_name
+
+        def initialize(attributes)
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/volume_types.rb

@@ -0,0 +1,26 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/volume/volume_type'
+
+module Fog
+  module Volume
+    class OpenStack
+      class VolumeTypes < Fog::Collection
+        model Fog::Volume::OpenStack::VolumeType
+
+        def all(options = {})
+          response = service.list_volume_types(options)
+          load(response.body['volume_types'])
+        end
+
+        def get(volume_type_id)
+          if volume_type = service.get_volume_type_details(volume_type_id).body['volume_type']
+            new(volume_type)
+          end
+        rescue Fog::Volume::OpenStack::NotFound
+          nil
+        end
+        alias_method :find_by_id, :get
+      end
+    end
+  end
+end

data/lib/fog/openstack/network.rb

@@ -118,10 +118,40 @@ module Fog
       class Mock
         def self.data
           @data ||= Hash.new do |hash, key|
+            network_id = Fog::UUID.uuid
+            subnet_id  = Fog::UUID.uuid
+            tenant_id  = Fog::Mock.random_hex(8)
+
             hash[key] = {
-              :networks => {},
+              :networks => {
+                network_id => {
+                  'id'                    => network_id,
+                  'name'                  => 'Public',
+                  'subnets'               => [subnet_id],
+                  'shared'                => true,
+                  'status'                => 'ACTIVE',
+                  'tenant_id'             => tenant_id,
+                  'provider_network_type' => 'vlan',
+                  'router:external'       => false,
+                  'admin_state_up'        => true,
+                }
+              },
               :ports => {},
-              :subnets => {},
+              :subnets => {
+                subnet_id => {
+                  'id'               => subnet_id,
+                  'name'             => "Public",
+                  'network_id'       => network_id,
+                  'cidr'             => "192.168.0.0/22",
+                  'ip_version'       => 4,
+                  'gateway_ip'       => Fog::Mock.random_ip,
+                  'allocation_pools' => [],
+                  'dns_nameservers'  => [Fog::Mock.random_ip, Fog::Mock.random_ip],
+                  'host_routes'      => [Fog::Mock.random_ip],
+                  'enable_dhcp'      => true,
+                  'tenant_id'        => tenant_id,
+                }
+              },
               :floating_ips => {},
               :routers => {},
               :lb_pools => {},
@@ -140,7 +170,7 @@ module Fog
                   "subnet" => 10,
                   "network" => 10,
                   "floatingip" => 50,
-                  "tenant_id" => Fog::Mock.random_hex(8),
+                  "tenant_id" => tenant_id,
                   "router" => 10,
                   "port" => 30
                 }
@@ -179,8 +209,6 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -254,7 +282,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end

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

@@ -4,7 +4,7 @@ module Fog
       class Real
         def add_flavor_access(flavor_ref, tenant_id)
           request(
-            :body => MultiJson.encode({
+            :body => Fog::JSON.encode({
               "addTenantAccess" => {
                 "tenant" => tenant_id
               }

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

@@ -6,7 +6,7 @@ module Fog
         def allocate_address(pool = nil)
 
           request(
-            :body     => MultiJson.encode({'pool' => pool}),
+            :body     => Fog::JSON.encode({'pool' => pool}),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => 'os-floating-ips.json'

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

@@ -11,7 +11,7 @@ module Fog
             }
           }
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "servers/%s/os-volume_attachments" % [server_id]

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

@@ -29,7 +29,7 @@ module Fog
           end
 
           request(
-            :body     => MultiJson.encode(data),
+            :body     => Fog::JSON.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => '/os-volumes_boot.json'

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

@@ -35,7 +35,7 @@ module Fog
           }
 
           request(
-            :body => MultiJson.encode(data),
+            :body => Fog::JSON.encode(data),
             :expects => 200,
             :method => 'POST',
             :path => 'flavors'