fog-openstack 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdbf12ad9b46bc13d3bbea77d69676b06d29a3d2
-  data.tar.gz: 5f71faf886da920a9703b1baee798aeac24ac412
+  metadata.gz: e9eaa14481a05674d47cb4442aa19d6339427ed1
+  data.tar.gz: b895660e192fd3313cc67b6c7696b25ef3c1caef
 SHA512:
-  metadata.gz: 1aed7613af33f4670f62e378e570c81dc3cdb03192715180f0a181f31eace57b7fed8d8452dd31a66cf0e7c690df1b48a12732b25f7c7e291062e3b13f780c8d
-  data.tar.gz: f4b581e2c3d3d1b9994eda1c0a6adca2ea84dd13378e141e57a4cc876f338c18892b9a69fcdd4c1fc926e70864c73265d632bdc98d3bfd54c6fe951c3ca5671d
+  metadata.gz: 8e20858aaa8a42796e3432f1724d8b49868f492c145657a780ee96782157dafe390a87e3457cf3e8569abe6fd0202c46d786399d11216bc8bd1f1e2ac5bc5e08
+  data.tar.gz: 9db350b24e7d90f38a2f973d4c554c6cba462f8a2b3adcb6e0a4bb81aa9ef3940ec1617481263cf2a51af5bad1746bf3054e2b3d36b0fe6739ffdd8e684a88a4

data/lib/fog/openstack/compute.rb

@@ -52,6 +52,8 @@ module Fog
       collection  :snapshots
       model       :host
       collection  :hosts
+      model       :server_group
+      collection  :server_groups
 
       ## REQUESTS
       #
@@ -225,6 +227,12 @@ module Fog
       request :list_zones_detailed
       request :list_availability_zones
 
+      # Server Group
+      request :list_server_groups
+      request :get_server_group
+      request :create_server_group
+      request :delete_server_group
+
       class Mock
         attr_reader :auth_token
         attr_reader :auth_token_expiration
@@ -284,6 +292,7 @@ module Fog
                   ],
                 },
               },
+              :server_groups             => {},
               :server_security_group_map => {},
               :addresses                 => {},
               :quota                     => {

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

@@ -0,0 +1,22 @@
+require 'fog/openstack/models/model'
+
+module Fog
+  module Compute
+    class OpenStack
+      class ServerGroup < Fog::OpenStack::Model
+        identity  :id
+        attribute :name
+        attribute :policies, :type => :array
+        attribute :members
+
+        VALID_SERVER_GROUP_POLICIES = ['affinity', 'anti-affinity'].freeze
+
+        def self.validate_server_group_policy(policy)
+          fail ArgumentError, "#{policy} is an invalid policy... must use one of #{VALID_SERVER_GROUP_POLICIES.join(', ')}" \
+            unless VALID_SERVER_GROUP_POLICIES.include? policy
+          true
+        end
+      end # class ServerGroup
+    end # class OpenStack
+  end # module Compute
+end # module Fog

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

@@ -0,0 +1,28 @@
+require 'fog/openstack/models/collection'
+require 'fog/openstack/models/compute/server_group'
+
+module Fog
+  module Compute
+    class OpenStack
+      class ServerGroups < Fog::OpenStack::Collection
+        model Fog::Compute::OpenStack::ServerGroup
+
+        def all(options = {})
+          load_response(service.list_server_groups(options), 'server_groups')
+        end
+
+        def get(server_group_id)
+          if server_group_id
+            new(service.get_server_group(server_group_id).body['server_group'])
+          end
+        rescue Fog::Compute::OpenStack::NotFound
+          nil
+        end
+
+        def create(*args)
+          new(service.create_server_group(*args).body['server_group'])
+        end
+      end # class ServerGroups
+    end # class OpenStack
+  end # module Compute
+end # module Fog

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

@@ -169,6 +169,12 @@ module Fog
 
           self.data[:last_modified][:servers][server_id] = Time.now
           self.data[:servers][server_id] = mock_data
+
+          if options['os:scheduler_hints'] && options['os:scheduler_hints']['group']
+            group = self.data[:server_groups][options['os:scheduler_hints']['group']]
+            group[:members] << server_id if group
+          end
+
           if options['return_reservation_id'] == 'True' then
             response.body = response_data
           else

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

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def create_server_group(name, policy)
+          Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy
+
+          body = { 'server_group' => {
+            'name' => name,
+            'policies' => [policy]
+          }}
+          request(
+            :body     => Fog::JSON.encode(body),
+            :expects  => 200,
+            :method   => 'POST',
+            :path     => 'os-server-groups'
+          )
+        end
+      end
+
+      class Mock
+        def create_server_group(name, policy)
+          Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy
+          id = SecureRandom.uuid
+          data[:server_groups][id] = { name: name, policies: [policy], members: []}
+          get_server_group id
+        end
+      end
+    end
+  end
+end

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

@@ -22,6 +22,8 @@ module Fog
               self.data[:last_modified][:servers].delete(server_id)
               self.data[:servers].delete(server_id)
               response.status = 204
+              group_id, = data[:server_groups].find { |_id, grp| grp[:members].include?(server_id) }
+              data[:server_groups][group_id][:members] -= [server_id] if group_id
             end
             response
           else

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

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def delete_server_group(group_id)
+          request(
+            :expects  => 204,
+            :method   => 'DELETE',
+            :path     => "os-server-groups/#{group_id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_server_group(group_id)
+          response = Excon::Response.new
+          response.status = data[:server_groups].delete(group_id) ? 204 : 404
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def get_server_group(group_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/os-server-groups/#{group_id}"
+          )
+        end
+      end
+
+      class Mock
+        def get_server_group(group_id)
+          grp = data[:server_groups][group_id]
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "Content-Type" => "text/html; charset=UTF-8",
+            "Content-Length" => "0",
+            "Date" => Date.new
+          }
+          response.body = { 'server_group' => {
+            'id'         => group_id,
+            'name'       => grp[:name],
+            'policies'   => grp[:policies],
+            'members'    => grp[:members],
+            'metadata'   => {},
+            'project_id' => 'test-project',
+            'user_id'    => 'test-user'
+          } }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def list_server_groups(options = {})
+          request(
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'os-server-groups',
+            :query   => options
+          )
+        end
+      end
+
+      class Mock
+        def list_server_groups(_options = {})
+          groups = data[:server_groups].map do |id, group|
+            group.merge('id' => id, 'project_id' => 'test-project', 'user_id' => 'test-user')
+          end
+          Excon::Response.new(
+            :body   => { 'server_groups' => groups },
+            :status => 200
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -282,6 +282,8 @@ files:
 - lib/fog/openstack/models/compute/security_group_rules.rb
 - lib/fog/openstack/models/compute/security_groups.rb
 - lib/fog/openstack/models/compute/server.rb
+- lib/fog/openstack/models/compute/server_group.rb
+- lib/fog/openstack/models/compute/server_groups.rb
 - lib/fog/openstack/models/compute/servers.rb
 - lib/fog/openstack/models/compute/service.rb
 - lib/fog/openstack/models/compute/services.rb
@@ -484,6 +486,7 @@ files:
 - lib/fog/openstack/requests/compute/create_security_group.rb
 - lib/fog/openstack/requests/compute/create_security_group_rule.rb
 - lib/fog/openstack/requests/compute/create_server.rb
+- lib/fog/openstack/requests/compute/create_server_group.rb
 - lib/fog/openstack/requests/compute/create_snapshot.rb
 - lib/fog/openstack/requests/compute/create_volume.rb
 - lib/fog/openstack/requests/compute/delete_aggregate.rb
@@ -496,6 +499,7 @@ files:
 - lib/fog/openstack/requests/compute/delete_security_group.rb
 - lib/fog/openstack/requests/compute/delete_security_group_rule.rb
 - lib/fog/openstack/requests/compute/delete_server.rb
+- lib/fog/openstack/requests/compute/delete_server_group.rb
 - lib/fog/openstack/requests/compute/delete_service.rb
 - lib/fog/openstack/requests/compute/delete_snapshot.rb
 - lib/fog/openstack/requests/compute/delete_volume.rb
@@ -521,6 +525,7 @@ files:
 - lib/fog/openstack/requests/compute/get_security_group.rb
 - lib/fog/openstack/requests/compute/get_security_group_rule.rb
 - lib/fog/openstack/requests/compute/get_server_details.rb
+- lib/fog/openstack/requests/compute/get_server_group.rb
 - lib/fog/openstack/requests/compute/get_server_password.rb
 - lib/fog/openstack/requests/compute/get_server_volumes.rb
 - lib/fog/openstack/requests/compute/get_snapshot_details.rb
@@ -542,6 +547,7 @@ files:
 - lib/fog/openstack/requests/compute/list_private_addresses.rb
 - lib/fog/openstack/requests/compute/list_public_addresses.rb
 - lib/fog/openstack/requests/compute/list_security_groups.rb
+- lib/fog/openstack/requests/compute/list_server_groups.rb
 - lib/fog/openstack/requests/compute/list_servers.rb
 - lib/fog/openstack/requests/compute/list_servers_detail.rb
 - lib/fog/openstack/requests/compute/list_services.rb
@@ -1109,7 +1115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OpenStack fog provider gem