yao 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d8d77a253364476ed886f96b9866b169870223
-  data.tar.gz: 95ee3a1bd9c3c4f241acd8b39eb65146cffba553
+  metadata.gz: 0cbe5100a5117a5be92da38233ff1f170c60555f
+  data.tar.gz: 7e610e7b24cb80f3c03683e3bebf2157cf564a2b
 SHA512:
-  metadata.gz: a62445345b8c370c1b3d6893f5936f51c1fc3a210c430a2b638b05c96e58a7fd0c78ab8384999067599b1b281956dbc23f88efa2dc40846507d83069f3a97410
-  data.tar.gz: 711c40e3e7ace2a0a39fa82eeb7a1987e03e45bbe8562aee73dd5843151000b14ab9b814b5af9dd424d9a2d4d56966396c0dd4f042a5339679bec6fd3a5f34a6
+  metadata.gz: 491f7385416be190cef852fde2afdf47f799e2c2d4852a6858361be9f89aebfa49027162cee9cdcd5da0787af174521c737f63b34eec460cb97ce79b533d164d
+  data.tar.gz: 839e12cdb4d00a35288a642252f0d72e06c5bd326d8ba79a4f75868e9faf35537a41fd62d9dd682863d67d12c04009cda3bd9f008c640c79f2ff3af8c85629ff

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 rvm:
   - 2.1.7
   - 2.2.3
+  - 2.3.0-preview1
 
 install: bundle install --path vendor/bundle
 

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.2.3
+
+* Enhance ceilometer resources #33 by @hsbt
+* Add Tenant#servers #34 by @hsbt
+* Now tested against Ruby 2.3.0-preview1 by @udzura
+
 ## v0.2.2
 
 * Fix `resources_name_in_json` method caching again by @pyama86

data/README.md

@@ -1,5 +1,7 @@
 # Yao
 
+![Logo](./yao-logo.png)
+
 YAO is a Yet Another OpenStack API Wrapper that rocks!! [![Build Status](https://travis-ci.org/yaocloud/yao.svg)](https://travis-ci.org/yaocloud/yao)
 
 ## Installation

data/lib/yao/resources.rb

@@ -20,6 +20,7 @@ module Yao
 
     autoload :Resource,          "yao/resources/resource"
     autoload :Meter,             "yao/resources/meter"
+    autoload :OldSample,         "yao/resources/old_sample"
     autoload :Sample,            "yao/resources/sample"
   end
 

data/lib/yao/resources/meter.rb

@@ -11,7 +11,7 @@ module Yao::Resources
     end
 
     def tenant
-      @tenant ||= Yao::User.get(project_id)
+      @tenant ||= Yao::Tenant.get(project_id)
     end
 
     def user

data/lib/yao/resources/old_sample.rb

@@ -0,0 +1,44 @@
+module Yao::Resources
+  class OldSample < Base
+    friendly_attributes :counter_name, :counter_type, :counter_unit, :counter_volume,
+                        :message_id, :project_id, :resource_id, :timestamp, :resource_metadata, :user_id
+                        :source
+
+    def recorded_at
+      Time.parse(self["recorded_at"] || self["timestamp"])
+    end
+    alias timestamp recorded_at
+
+    def id
+      meter_id
+    end
+
+    def resource
+      @resource ||= Yao::Resource.get(resource_id)
+    end
+
+    def tenant
+      @tenant ||= Yao::Tenant.get(project_id)
+    end
+
+    def user
+      @user ||= Yao::User.get(user_id)
+    end
+
+    self.service        = "metering"
+    self.api_version    = "v2"
+
+    # get /v2/meters/{id} returns samples!
+    def self.list(meter_name, query={})
+      cache_key = query.values.join
+      cache[cache_key] = GET("meters/#{meter_name}", query).body unless cache[cache_key]
+      return_resources(cache[cache_key])
+    end
+
+    def self.cache
+      @@_cache ||= {}
+    end
+
+    # TODO: implement `def self.create'
+  end
+end

data/lib/yao/resources/sample.rb

@@ -1,16 +1,15 @@
 module Yao::Resources
   class Sample < Base
-    friendly_attributes :counter_name, :counter_type, :counter_unit, :counter_volume,
-                        :message_id, :project_id, :resource_id, :timestamp, :resource_metadata, :user_id
-                        :source
+    friendly_attributes :id, :metadata, :meter,
+                        :source, :type, :unit, :volume
+                        :resouce_id, :tenant_id, :user_id
 
     def recorded_at
-      Time.parse(self["recorded_at"] || self["timestamp"])
+      Time.parse(self["recorded_at"])
     end
-    alias timestamp recorded_at
 
-    def id
-      meter_id
+    def timestamp
+      Time.parse(self["timestamp"])
     end
 
     def resource
@@ -18,7 +17,7 @@ module Yao::Resources
     end
 
     def tenant
-      @tenant ||= Yao::User.get(project_id)
+      @tenant ||= Yao::Tenant.get(project_id)
     end
 
     def user
@@ -27,17 +26,6 @@ module Yao::Resources
 
     self.service        = "metering"
     self.api_version    = "v2"
-
-    # get /v2/meters/{id} returns samples!
-    def self.list(id_or_url, query={})
-      json = if id_or_url =~ /^https?:\/\//
-               GET(id_or_url).body
-             else
-               GET("meters/#{id_or_url}", query).body
-             end
-      return_resources(json)
-    end
-
-    # TODO: implement `def self.create'
+    self.resources_name = "samples"
   end
 end

data/lib/yao/resources/server.rb

@@ -21,6 +21,11 @@ module Yao::Resources
     self.service        = "compute"
     self.resource_name  = "server"
     self.resources_name = "servers"
+
+    def old_samples(counter_name: nil, query: {})
+      Yao::OldSample.list(counter_name, query).select{|os| os.resource_metadata["instance_id"] == id}
+    end
+
     def self.start(id)
       action(id, "os-start" => nil)
     end

data/lib/yao/resources/tenant.rb

@@ -8,6 +8,18 @@ module Yao::Resources
     self.admin          = true
     self.return_single_on_querying = true
 
+    def servers
+      @servers ||= Yao::Server.list(all_tenants: 1).select{|s| s.tenant_id == id }
+    end
+
+    def meters
+      @meters ||= Yao::Meter.list({'q.field': 'project_id', 'q.op': 'eq', 'q.value': id})
+    end
+
+    def meters_by_name(meter_name)
+      meters.select{|m| m.name == meter_name}
+    end
+
     class << self
       def get_by_name(name)
         self.list(name: name)

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -186,6 +186,7 @@ files:
 - lib/yao/resources/metadata_available.rb
 - lib/yao/resources/meter.rb
 - lib/yao/resources/network.rb
+- lib/yao/resources/old_sample.rb
 - lib/yao/resources/port.rb
 - lib/yao/resources/resource.rb
 - lib/yao/resources/restfully_accessible.rb
@@ -207,6 +208,7 @@ files:
 - test/yao/test_config.rb
 - test/yao/test_server_error.rb
 - test/yao/test_token.rb
+- yao-logo.png
 - yao.gemspec
 homepage: https://github.com/yaocloud/yao
 licenses:
@@ -228,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
@@ -240,3 +242,4 @@ test_files:
 - test/yao/test_config.rb
 - test/yao/test_server_error.rb
 - test/yao/test_token.rb
+has_rdoc: