fog-openstack 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc6df6714fdc0919e30d872748400f21dd6a1b76
-  data.tar.gz: 3d057c3aad27a48d1ee8901f71b4b85fe7e03de2
+  metadata.gz: 50563e6b22ba89f6fa72a25141b465c03a062362
+  data.tar.gz: 1fe391d2160e4030614e710cf97763ed44caf90b
 SHA512:
-  metadata.gz: 36bfe27a022057590ce817e20089d3bfe7ff00e42be16173d9077cb3b1dd314047486d359ad5f65dd0d3d489804315506031d014ba8b2cfe02f88f195d10ead1
-  data.tar.gz: bc82e6dee769885e863f2f0e9dd822d4210e1fb2628fa8daec888c08f29dca37c6c1be55e7b626b601a0f8e7e24df6b0ef6c9a4f897668d84f1158afdd18379d
+  metadata.gz: f31a8b75f9508e32dfeffffa991e8ef74389454acabe7b0bca5f1bc9117d33dc310c089b16cef778b909461d24cc44eefd1fb67ad82c1fbc294f9507b2a47697
+  data.tar.gz: f5e1ccdc99e2be0ac021c0cc40202b3e6fbf30641328abae2b6879c95c63c72d06ba6f087eaba7fe7a1ef06d999ae166e31fc070cc80582fdd4b0aec9a476f15

data/docs/orchestration.md

@@ -116,6 +116,29 @@ It can be also obtained through the details method of a simple stack object
 stack.details
 ```
 
+To update a stack while manipulating a Stack object from the Stack Collection:
+
+```ruby
+heat_template = { "template": { "description": "Updated description" } }
+stack.save(heat_template)
+```
+
+`save` uses the `update_stack` request method, although it expects a Stack object as well:
+
+```ruby
+heat_template = { "template": { "description": "Updated description" } }
+service.update_stack(stack, heat_template)
+```
+
+Alternatively a request only approach can be used, providing a stack id and name:
+
+```ruby
+id = "49b83314-d341-468a-aef4-44bbccce251e"
+name = "stack_name"
+heat_template = { "template": { "description": "Other update description" } }
+service.update_stack(id, name, heat_template)
+```
+
 A stack knows about related `events`:
 
 ```ruby

data/examples/event/basics.rb

@@ -0,0 +1,22 @@
+require 'fog/openstack'
+require 'time'
+
+auth_url = "http://10.0.0.101:5000/v2.0/tokens"
+username = 'admin'
+password = 'D78JVyRnzJG8j7Mb6fgpeUMp7'
+
+@connection_params = {
+    :openstack_auth_url     => auth_url,
+    :openstack_username     => username,
+    :openstack_api_key      => password,
+}
+
+puts "### SERVICE CONNECTION ###"
+
+event_service = Fog::Event::OpenStack.new(@connection_params)
+
+p event_service
+
+puts "### LIST EVENTS ###"
+
+p event_service.events.all

data/gemfiles/Gemfile-1.9

@@ -7,6 +7,7 @@ group :development, :test do
   gem "ipaddress",       ">= 0.8"
   gem "bundler",         "~> 1.6"
   gem "mime-types",      "2.6.2"
+  gem "nokogiri",        "< 1.7.0"
   gem "rake",            "~> 10.0"
   gem "rubocop",         "< 0.42"
   gem "rubyzip",         "~> 0.9.9"

data/lib/fog/compute/openstack.rb

@@ -54,6 +54,8 @@ module Fog
       collection  :hosts
       model       :server_group
       collection  :server_groups
+      model       :os_interface
+      collection  :os_interfaces
 
       ## REQUESTS
       #
@@ -147,6 +149,10 @@ module Fog
 
       # Hypervisor
       request :get_hypervisor_statistics
+      request :get_hypervisor
+      request :list_hypervisors
+      request :list_hypervisors_detail
+      request :list_hypervisor_servers
 
       # Metadata
       request :list_metadata
@@ -233,6 +239,12 @@ module Fog
       request :create_server_group
       request :delete_server_group
 
+      # Server Os Interfaces
+      request :list_os_interfaces
+      request :get_os_interface
+      request :create_os_interface
+      request :delete_os_interface
+
       class Mock
         attr_reader :auth_token
         attr_reader :auth_token_expiration
@@ -310,8 +322,22 @@ module Fog
                 'ram'                         => 51200
               },
               :volumes                   => {},
-              :snapshots                 => {}
-            }
+              :snapshots                 => {},
+              :os_interfaces             => [
+                {
+                  "fixed_ips" => [
+                    {
+                      "ip_address" => "192.168.1.3",
+                      "subnet_id" => "f8a6e8f8-c2ec-497c-9f23-da9616de54ef"
+                    }
+                  ],
+                  "mac_addr" => "fa:16:3e:4c:2c:30",
+                  "net_id" => "3cb9bc59-5699-4588-a4b1-b87f96708bc6",
+                  "port_id" => "ce531f90-199f-48c0-816c-13e38010b442",
+                  "port_state" => "ACTIVE"
+                }
+              ]
+            }  
           end
         end
 

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

@@ -0,0 +1,15 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Compute
+    class OpenStack
+      class OsInterface < Fog::OpenStack::Model
+        identity  :port_id
+        attribute :fixed_ips, :type => :array
+        attribute :mac_addr
+        attribute :net_id
+        attribute :port_state
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'fog/openstack/models/collection'
+require 'fog/compute/openstack/models/os_interface'
+
+module Fog
+  module Compute
+    class OpenStack
+      class OsInterfaces < Fog::OpenStack::Collection
+        model Fog::Compute::OpenStack::OsInterface
+
+        attribute :server
+
+        def all
+          requires :server
+
+          data = service.list_os_interfaces(server.id)
+          load_response(data, 'interfaceAttachments')
+        end
+
+        def get(port_id)
+          requires :server
+
+          data = service.get_os_interface(server.id,port_id)
+          load_response(data, 'interfaceAttachment')
+        end
+      end
+    end
+  end
+end

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

@@ -108,6 +108,11 @@ module Fog
           @all_addresses ||= service.list_all_addresses.body["floating_ips"].select { |data| data['instance_id'] == id }
         end
 
+        def os_interfaces
+          requires :id
+          service.os_interfaces(:server => self)
+        end
+
         def reload
           @all_addresses = nil
           super

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

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # === Parameters
+        # * server_id <~String>
+        # * options <~Hash>
+        def create_os_interface(server_id, options={})
+          body = {
+            'interfaceAttachment' => {}
+          }
+
+          if options[:port_id]
+            body['interfaceAttachment']['port_id'] = options[:port_id]
+          elsif options[:net_id]
+            body['interfaceAttachment']['net_id'] = options[:net_id]
+          end
+
+          if options[:ip_address]
+            body['interfaceAttachment']['fixed_ips'] = {ip_address: options[:ip_address]}
+          end
+
+          request(
+            :body    => Fog::JSON.encode(body),
+            :expects => [200, 201, 202, 204],
+            :method  => 'POST',
+            :path    => "servers/#{server_id}/os-interface"
+          )
+        end
+      end
+
+      class Mock
+        def create_os_interface(server_id, options={})
+          Excon::Response.new(
+            :body   => {'interfaceAttachment' => data[:os_interfaces].first},
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Fog
           request(
             :expects => 202,
             :method  => 'DELETE',
-            :path    => "os-keypairs/#{key_name}"
+            :path    => "os-keypairs/#{Fog::OpenStack.escape(key_name)}"
           )
         end
       end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # === Parameters
+        # * server_id <~String>
+        # * port_id <~String>
+        def delete_os_interface(server_id, port_id)
+          request(
+            :expects => [200, 202,204],
+            :method  => 'DELETE',
+            :path    => "servers/#{server_id}/os-interface/#{port_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_os_interface(server_id, port_id)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def get_hypervisor(hypervisor_id)
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => "os-hypervisors/#{hypervisor_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_hypervisor(hypervisor_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "hypervisor" => {
+              "cpu_info"             => {
+                "arch"     => "x86_64",
+                "model"    => "Nehalem",
+                "vendor"   => "Intel",
+                "features" => [
+                  "pge",
+                  "clflush"
+                ],
+                "topology" => {
+                  "cores"   => 1,
+                  "threads" => 1,
+                  "sockets" => 4
+                }
+              },
+              "current_workload"     => 0,
+              "status"               => "enabled",
+              "state"                => "up",
+              "disk_available_least" => 0,
+              "host_ip"              => "1.1.1.1",
+              "free_disk_gb"         => 1028,
+              "free_ram_mb"          => 7680,
+              "hypervisor_hostname"  => "fake-mini",
+              "hypervisor_type"      => "fake",
+              "hypervisor_version"   => 1000,
+              "id"                   => hypervisor_id,
+              "local_gb"             => 1028,
+              "local_gb_used"        => 0,
+              "memory_mb"            => 8192,
+              "memory_mb_used"       => 512,
+              "running_vms"          => 0,
+              "service"              => {
+                "host"            => "host1",
+                "id"              => 7,
+                "disabled_reason" => null
+              },
+              "vcpus"                => 1,
+              "vcpus_used"           => 0
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Fog
           request(
             :expects => 200,
             :method  => 'GET',
-            :path    => "os-keypairs/#{key_name}"
+            :path    => "os-keypairs/#{Fog::OpenStack.escape(key_name)}"
           )
         end
       end

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def get_os_interface(server_id,port_id)
+          request(
+            :expects => [200, 202, 203],
+            :method  => 'GET',
+            :path    => "servers/#{server_id}/os-interface/#{port_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_os_interface(server_id,port_id)
+          Excon::Response.new(
+            :body   => {'interfaceAttachment' => data[:os_interfaces].first},
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_hypervisor_servers(hypervisor_id, options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => "os-hypervisors/#{hypervisor_id}/servers",
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_hypervisor_servers(hypervisor_id, _options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {'hypervisors' => [
+            {
+              "hypervisor_hostname" => "fake-mini",
+              "id"                  => hypervisor_id,
+              "state"               => "up",
+              "status"              => "enabled",
+              "servers"             => [
+                {
+                  "name" => "test_server1",
+                  "uuid" => "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+                },
+                {
+                  "name" => "test_server2",
+                  "uuid" => "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+                }
+              ]
+            }
+          ]}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_hypervisors(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'os-hypervisors',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_hypervisors(_options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {'hypervisors' => [
+            {"hypervisor_hostname" => "fake-mini", "id" => 2, "state" => "up", "status" => "enabled"}
+          ]}
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_hypervisors_detail(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'os-hypervisors/detail',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_hypervisors_detail(_options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "hypervisors"       => [{
+              "cpu_info"             => {
+                "arch"     => "x86_64",
+                "model"    => "Nehalem",
+                "vendor"   => "Intel",
+                "features" => [
+                  "pge",
+                  "clflush"
+                ],
+                "topology" => {
+                  "cores"   => 1,
+                  "threads" => 1,
+                  "sockets" => 4
+                }
+              },
+              "current_workload"     => 0,
+              "status"               => "enabled",
+              "state"                => "up",
+              "disk_available_least" => 0,
+              "host_ip"              => "1.1.1.1",
+              "free_disk_gb"         => 1028,
+              "free_ram_mb"          => 7680,
+              "hypervisor_hostname"  => "fake-mini",
+              "hypervisor_type"      => "fake",
+              "hypervisor_version"   => 1000,
+              "id"                   => 2,
+              "local_gb"             => 1028,
+              "local_gb_used"        => 0,
+              "memory_mb"            => 8192,
+              "memory_mb_used"       => 512,
+              "running_vms"          => 0,
+              "service"              => {
+                "host"            => "host1",
+                "id"              => 7,
+                "disabled_reason" => null
+              },
+              "vcpus"                => 1,
+              "vcpus_used"           => 0
+            }],
+            "hypervisors_links" => [
+              {
+                "href" => "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors/detail?limit=1&marker=2",
+                "rel"  => "next"
+              }
+            ]
+          }
+          response
+        end
+      end
+    end
+  end
+end