yao 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e696fbc7834e739c27a29deb49679d3460773cb
-  data.tar.gz: 250225f1088c806b3f5dbd35fca145cabf8ef666
+  metadata.gz: ba36ff08aa0365694cdd8b503c8f281326757bdd
+  data.tar.gz: 5eb339c8efba8d3120407cbca1be572ca7caef2f
 SHA512:
-  metadata.gz: 3a8560868dd98e7a2a9d9175691b9508c73ecaa4fe5b8bcef63d7471dc5d1decafba99249b07a0c09a86a47a5a5644a1e36658251c2250529994f8e81ca411fa
-  data.tar.gz: 23bb94097a85315a46770eeb87fddcdbc119916d4adb1da78079ea1ab4218899d1852f9a56e18ca4ecce0f8cd353a474be791d4d35fb1045ba6c4ea85feef605
+  metadata.gz: c6c1910d273332de80491414bf07000ba0197b661e834bbd21c389af91b7ee4efe070719ef1a0da4945301d4122ef57acbd349215deb5020a4705ca0c8b25b5c
+  data.tar.gz: 7740df0df2806e24a2ba621185abacca35c87df2187d367d304de70b1a96847eb20616adb3ceb50a9e81c6513d1dcc05c2e85715d3d434afe8aad21cff10392c

data/lib/yao/client.rb

@@ -8,24 +8,33 @@ module Yao
   module Client
     class ClientSet
       def initialize
-        @pool = {}
+        @pool       = {}
+        @admin_pool = {}
       end
-      attr_reader :pool
+      attr_reader :pool, :admin_pool
 
       %w(default compute network image metering volume orchestration identity).each do |type|
         define_method(type) do
           self.pool[type]
         end
+
+        define_method("#{type}_admin") do
+          self.admin_pool[type]
+        end
       end
 
       def register_endpoints(endpoints, token: nil)
-        endpoints.each_pair do |type, endpoint|
+        endpoints.each_pair do |type, urls|
           # XXX: neutron just have v2.0 API and endpoint may not have version prefix
-          if type == "network" && URI.parse(endpoint).path == "/"
-            endpoint = File.join(endpoint, "v2.0")
+          if type == "network"
+            urls = urls.map {|public_or_admin, url|
+              url = URI.parse(url).path == "/" ? File.join(url, "v2.0") : url
+              [public_or_admin, url]
+            }.to_h
           end
 
-          self.pool[type] = Yao::Client.gen_client(endpoint, token: token)
+          self.pool[type]       = Yao::Client.gen_client(urls[:public_url], token: token)
+          self.admin_pool[type] = Yao::Client.gen_client(urls[:admin_url],  token: token)
         end
       end
     end
@@ -66,7 +75,7 @@ module Yao
 
       def reset_client(new_endpoint=nil)
         set = ClientSet.new
-        set.register_endpoints("default" => (new_endpoint || Yao.config.endpoint))
+        set.register_endpoints("default" => {public_url: new_endpoint || Yao.config.endpoint})
         self.default_client = set
       end
     end

data/lib/yao/resources/restfully_accessible.rb

@@ -23,24 +23,60 @@ module Yao::Resources
       @service
     end
 
+    def admin=(bool)
+      @admin = bool
+    end
+
+    def return_single_on_querying=(bool)
+      @return_single_on_querying = bool
+    end
+
+    def resources_path
+      @resources_path || resources_name
+    end
+
+    def resources_path=(path)
+      @resources_path = path.sub(%r!^\/!, "")
+    end
+
     def client
-      Yao.default_client.pool[service]
+      if @admin
+        Yao.default_client.admin_pool[service]
+      else
+        Yao.default_client.pool[service]
+      end
+    end
+
+    def as_member(&blk)
+      if @admin
+        @admin = false
+        result = yield(blk)
+        @admin = true
+        result
+      else
+        yield blk
+      end
     end
 
     # restful methods
     def list(query={})
-      return_resources(GET(resources_name, query).body[resources_name_in_json])
+      json = GET(resources_path, query).body
+      if @return_single_on_querying && !query.empty?
+        return_resource(json[resource_name_in_json])
+      else
+        return_resources(json[resources_name_in_json])
+      end
     end
 
     def list_detail(query={})
-      return_resources(GET([resources_name, "detail"].join("/"), query).body[resources_name_in_json])
+      return_resources(GET([resources_path, "detail"].join("/"), query).body[resources_name_in_json])
     end
 
     def get(id_or_permalink, query={})
       res = if id_or_permalink =~ /^https?:\/\//
               GET(id_or_permalink, query)
             else
-              GET([resources_name, id_or_permalink].join("/"), query)
+              GET([resources_path, id_or_permalink].join("/"), query)
             end
       return_resource(res.body[resource_name_in_json])
     end
@@ -50,7 +86,7 @@ module Yao::Resources
       params = {
         resource_name_in_json => resource_params
       }
-      res = POST(resources_name) do |req|
+      res = POST(resources_path) do |req|
         req.body = params.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -61,7 +97,7 @@ module Yao::Resources
       params = {
         resource_name_in_json => resource_params
       }
-      res = PUT([resources_name, id].join("/")) do |req|
+      res = PUT([resources_path, id].join("/")) do |req|
         req.body = params.to_json
         req.headers['Content-Type'] = 'application/json'
       end
@@ -69,7 +105,7 @@ module Yao::Resources
     end
 
     def destroy(id)
-      res = DELETE([resources_name, id].join("/"))
+      res = DELETE([resources_path, id].join("/"))
       res.body
     end
 

data/lib/yao/resources/role.rb

@@ -0,0 +1,11 @@
+module Yao::Resources
+  class Role < Base
+    friendly_attributes :name, :description, :id
+
+    self.service        = "identity"
+    self.resource_name  = "role"
+    self.resources_name = "roles"
+    self.resources_path = "/OS-KSADM/roles"
+    self.admin          = true
+  end
+end

data/lib/yao/resources/tenant.rb

@@ -5,5 +5,17 @@ module Yao::Resources
     self.service        = "identity"
     self.resource_name  = "tenant"
     self.resources_name = "tenants"
+    self.admin          = true
+
+    class << self
+      def get_by_name(name)
+        self.get("", name: name)
+      end
+      alias find_by_name get_by_name
+
+      def accessible
+        as_member { self.list }
+      end
+    end
   end
 end

data/lib/yao/resources/user.rb

@@ -0,0 +1,20 @@
+module Yao::Resources
+  class User < Base
+    friendly_attributes :name, :email, :enabled, :id
+
+    alias enabled? enabled
+
+    self.service        = "identity"
+    self.resource_name  = "user"
+    self.resources_name = "users"
+    self.admin          = true
+    self.return_single_on_querying = true
+
+    class << self
+      def get_by_name(name)
+        self.list(name: name)
+      end
+      alias find_by_name get_by_name
+    end
+  end
+end

data/lib/yao/resources.rb

@@ -15,7 +15,8 @@ module Yao
     autoload :Port,              "yao/resources/port"
     autoload :Tenant,            "yao/resources/tenant"
     autoload :Host,              "yao/resources/host"
-
+    autoload :User,              "yao/resources/user"
+    autoload :Role,              "yao/resources/role"
   end
 
   def self.const_missing(name)

data/lib/yao/token.rb

@@ -47,16 +47,15 @@ module Yao
       return unless _endpoints
 
       _endpoints.each do |endpoint_data|
-        key = endpoint_data["type"]
-        value = if d = endpoint_data["endpoints"].first
-                  d["publicURL"]
-                else
-                  nil
-                end
-        if value
-          @endpoints[key] = value
-        end
+        type = endpoint_data["type"]
+        endpoint = endpoint_data["endpoints"].first
+        urls = {}
+        urls[:public_url] = endpoint["publicURL"] if endpoint["publicURL"]
+        urls[:admin_url]  = endpoint["adminURL"]  if endpoint["adminURL"]
+
+        @endpoints[type] = urls
       end
+
       Yao.default_client.register_endpoints(@endpoints, token: self)
     end
   end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -182,11 +182,13 @@ files:
 - lib/yao/resources/network.rb
 - lib/yao/resources/port.rb
 - lib/yao/resources/restfully_accessible.rb
+- lib/yao/resources/role.rb
 - lib/yao/resources/security_group.rb
 - lib/yao/resources/security_group_rule.rb
 - lib/yao/resources/server.rb
 - lib/yao/resources/subnet.rb
 - lib/yao/resources/tenant.rb
+- lib/yao/resources/user.rb
 - lib/yao/server_error.rb
 - lib/yao/token.rb
 - lib/yao/version.rb