kakin 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f4cbb82bf72ff7739687b18cb6a6c2d059a8d5b4630cffbd464760154e336d8
-  data.tar.gz: fb806dbb427e76cd69cf59350faf790633f0e6584dfb4d667a7e2b7dbf7ff91b
+  metadata.gz: c4d79cc2ffb8deb8ebb267963327939ee177c60ddb014217ee433a0394981c9f
+  data.tar.gz: bf19b09fc2874309ed228ed06a9179e659d5f3d54ecfa7db6e4357b8898ad9cd
 SHA512:
-  metadata.gz: 3ea58c1be161a984a54b026bd749497215920e2b7fc7ba4dd3a7427e6c168da1497be417a41df0958e5cfaf186fac64dff1af417d65bfb0cbd299b6314107975
-  data.tar.gz: 759198768dc66b2fb180a47d962a406505e8a36a39a7a421368e99570c75d8db5a8269358a9ad64707f058ee99fe738d08cd6b84f243a9c3562f3b7a918561bc
+  metadata.gz: 276941d537c9c47a2e31b88564cf9d12a8c11ce2b56fd035d0b35113fcbbf0add7e2cdaa8ea5cbfe43fc4b4a9893fa1e6b8925aae4aff1c90a7d4bf1a72735cc
+  data.tar.gz: f7f2dc5c6369018a79060ce2a7b947b69efbb7625fe2eb11d120e5b4d24c5fe3e848667e8b29e526c69ddb3f15c2ed51ca8ac04fcd58c8b275a77bc7d79234c4

data/README.md

@@ -12,12 +12,20 @@ You need to create configuration file located `~/.kakin` for openstack credentia
 
 ```
 auth_url: "http://your-openstack-host:35357/v2.0/tokens"
-management_url: "http://your-openstack-host:8774/v2"
 username: "username"
 tenant: "your-admin-tenant"
 password: "password"
 ```
 
+Or set with environment variable.
+
+```
+export OS_AUTH_URL=<your openstack auth url>
+export OS_USER=<your username>
+export OS_TENANT_NAME=<your tenant>
+export OS_PASSWORD=<your password>
+```
+
 You can get resource usage with following command.
 
 ```

data/kakin.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'yao'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
 end

data/lib/kakin/cli.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'json'
 require 'net/http'
 require 'yao'
+require 'kakin/yao_ext/yao'
 require 'kakin/yao_ext/tenant'
 require 'kakin/yao_ext/server'
 require 'kakin/yao_ext/floatingip'
@@ -26,20 +27,17 @@ module Kakin
 
       STDERR.puts "Start: #{start_time}"
       STDERR.puts "End:   #{end_time}"
-      url = URI.parse("#{Kakin::Configuration.management_url}/#{Yao::Tenant.get_by_name(Kakin::Configuration.tenant).id}/os-simple-tenant-usage?start=#{start_time}&end=#{end_time}")
-      req = Net::HTTP::Get.new(url)
-      req["Accept"] = "application/json"
-      req["X-Auth-Token"] = Yao::Auth.try_new.token
-      res = Net::HTTP.start(url.host, url.port) {|http|
-        http.request(req)
-      }
-
-      if res.code != "200"
+      client = Yao.default_client.pool['compute']
+      res = client.get("./os-simple-tenant-usage?start=#{start_time}&end=#{end_time}") do |req|
+        req.headers["Accept"] = "application/json"
+      end
+
+      if res.status != 200
         raise "usage data fatch is failed"
       else
         result = Hash.new
-        tenant_usages = JSON.load(res.body)["tenant_usages"]
-        tenants = Yao::Tenant.list
+        tenant_usages = res.body["tenant_usages"]
+        tenants = Yao.tenant_klass.list
 
         unless options[:t].empty?
           tenant = tenants.find { |tenant| tenant.name == options[:t] }
@@ -49,7 +47,9 @@ module Kakin
         end
 
         tenant_usages.each do |usage|
-          tenant = tenants.find { |tenant| tenant.id == usage["tenant_id"] }
+          tenant_id = usage["tenant_id"]
+          tenant = tenants.find { |tenant| tenant.id == tenant_id }
+          tenant_name = tenant&.name || tenant_id
 
           total_vcpus_usage     = usage["total_vcpus_usage"]
           total_memory_mb_usage = usage["total_memory_mb_usage"]
@@ -59,7 +59,7 @@ module Kakin
           bill_memory = total_memory_mb_usage * yaml["memory_mb_per_hour"]
           bill_disk   = total_local_gb_usage * yaml["disk_gb_per_hour"]
 
-          result[tenant.name] = {
+          result[tenant_name] = {
             'bill_total'            => bill_vcpu + bill_memory + bill_disk,
             'bill_vcpu'             => bill_vcpu,
             'bill_memory'           => bill_memory,
@@ -92,9 +92,9 @@ module Kakin
 
       result = Hash.new
       tenants = unless options[:t].empty?
-                  Yao::Tenant.list(name: options[:t])
+                  Yao.tenant_klass.list(name: options[:t])
                 else
-                  Yao::Tenant.list
+                  Yao.tenant_klass.list
                 end
       tenants = [tenants] unless tenants.is_a?(Array)
 
@@ -122,9 +122,9 @@ module Kakin
 
       result = Hash.new
       tenants = unless options[:t].empty?
-                  Yao::Tenant.list(name: options[:t])
+                  Yao.tenant_klass.list(name: options[:t])
                 else
-                  Yao::Tenant.list
+                  Yao.tenant_klass.list
                 end
       tenants = [tenants] unless tenants.is_a?(Array)
 
@@ -149,9 +149,9 @@ module Kakin
 
       result = Hash.new
       tenants = unless options[:t].empty?
-                  Yao::Tenant.list(name: options[:t])
+                  Yao.tenant_klass.list(name: options[:t])
                 else
-                  Yao::Tenant.list
+                  Yao.tenant_klass.list
                 end
       tenants = [tenants] unless tenants.is_a?(Array)
       volume_types = Yao::VolumeType.list
@@ -160,10 +160,10 @@ module Kakin
       tenants.each do |tenant|
         result[tenant.name] ||= {}
         volume_types.each do |volume_type|
-          total = volumes.select { |volume| volume.tenant_id == tenant.id && volume.volume_type == volume_type.name }.map(&:size).sum
+          count = volumes.select { |volume| volume.tenant_id == tenant.id && volume.volume_type == volume_type.name }.map(&:size).sum
           result[tenant.name][volume_type.name] = {
-              'total': total,
-              'total_usage': total * yaml['volume_cost_per_gb'][volume_type.name]
+              'count': count,
+              'total_usage': count * yaml['volume_cost_per_gb'][volume_type.name]
           }
         end
       end

data/lib/kakin/configuration.rb

@@ -1,28 +1,46 @@
 module Kakin
   class Configuration
 
-    def self.management_url
-      @@_management_url
-    end
-
     def self.tenant
       @@_tenant
     end
 
     def self.setup
-      yaml = YAML.load_file(File.expand_path('~/.kakin'))
+      config = {
+        'auth_url'             => ENV['OS_AUTH_URL'],
+        'tenant'               => ENV['OS_TENANT_NAME'] || ENV['OS_PROJECT_NAME'],
+        'username'             => ENV['OS_USERNAME'],
+        'password'             => ENV['OS_PASSWORD'],
+        'client_cert'          => ENV['OS_CERT'],
+        'client_key'           => ENV['OS_KEY'],
+        'identity_api_version' => ENV['OS_IDENTITY_API_VERSION'],
+        'user_domain_name'     => ENV['OS_USER_DOMAIN_NAME'],
+        'project_domain_name'  => ENV['OS_PROJECT_DOMAIN_NAME'],
+        'timeout'              => ENV['YAO_TIMEOUT'],
+        'management_url'       => ENV['YAO_MANAGEMENT_URL'],
+        'debug'                => ENV['YAO_DEBUG'] || false,
+      }
+
+      file_path = File.expand_path('~/.kakin')
+      if File.exist?(file_path)
+        yaml = YAML.load_file(file_path)
+        config.merge!(yaml)
+      end
 
-      @@_management_url = yaml['management_url']
-      @@_tenant = yaml['tenant']
+      @@_tenant = config['tenant']
 
       Yao.configure do
-        auth_url yaml['auth_url']
-        tenant_name yaml['tenant']
-        username yaml['username']
-        password yaml['password']
-        timeout yaml['timeout'] if yaml['timeout']
-        client_cert yaml['client_cert'] if yaml['client_cert']
-        client_key yaml['client_key'] if yaml['client_key']
+        auth_url config['auth_url']
+        tenant_name config['tenant']
+        username config['username']
+        password config['password']
+        timeout config['timeout'].to_i if config['timeout']
+        client_cert config['client_cert'] if config['client_cert']
+        client_key config['client_key'] if config['client_key']
+        identity_api_version config['identity_api_version'] if config['identity_api_version']
+        user_domain_name config['user_domain_name'] if config['user_domain_name']
+        project_domain_name config['project_domain_name'] if config['project_domain_name']
+        debug config['debug']
       end
     end
   end

data/lib/kakin/version.rb

@@ -1,3 +1,3 @@
 module Kakin
-  VERSION = "0.2.0"
+  VERSION = "0.4.1"
 end

data/lib/kakin/yao_ext/yao.rb

@@ -0,0 +1,10 @@
+module Yao
+  def self.tenant_klass
+    Yao.keystone_v2? ? Yao::Tenant : Yao::Project
+  end
+
+  # @return [Bool]
+  def self.keystone_v2?
+    Yao.default_client.pool["identity"].url_prefix.to_s.match(/v2\.0/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kakin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - buty4649
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,7 @@ files:
 - lib/kakin/yao_ext/floatingip.rb
 - lib/kakin/yao_ext/server.rb
 - lib/kakin/yao_ext/tenant.rb
+- lib/kakin/yao_ext/yao.rb
 homepage: https://github.com/yaocloud/kakin
 licenses: []
 metadata: {}
@@ -125,8 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: kakin is resource calcuration tool for OpenStack