kakin 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb8efde1aaf89f79943e1430156764e6e96983cf35f7d6fac5bca89362dccce
-  data.tar.gz: f8ad30e03dc74e4ad47e7d8f4f423e87ab1ee0d0c8bc08a12fb458697d7df08a
+  metadata.gz: 5f0752b03aae430bf490e83b28e5b69d5e0923279ca991c2a71399c90baaa146
+  data.tar.gz: 9326074cb9e2cab64ac03b4824c6d477954d50fc210be60eee6bd35b82a82c53
 SHA512:
-  metadata.gz: '049ad99c0c396f8e80c163c990b5fd75399c80e6736f92fbb8cc6a21e1d359f528fdb3081dc538cf2a71a59293ab73042680a85bf112d3bf5d901b67a24b3e03'
-  data.tar.gz: 8e7ca17705acfd89b4187e9ec769abb0e49e741bf31b869e19d4eb08652bfe72a8e1e4c243de82f94d686d6e1addb320a21e25e6ac2255f9e4661b828a571b6c
+  metadata.gz: e429c4356d032c61f9183379ee51548bbae1ce24da90740bb013661c8963af05473586c91af283555ee82e3132111b9848a33ac9be3e5bafc4a3cfa046ad210a
+  data.tar.gz: 9a1076127b78ee0bd99dcfc6fffa60a61e99dfd6f7ae06c5a0647af3107b5c6f56364b2c6b01d7896e1e54c3c0d9aa8b4a0067e87f59cbf29384bd66285b3981

data/kakin.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'thor'
-  spec.add_dependency 'yao'
+  spec.add_dependency 'yao', ">= 0.14.0"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest"
 end

data/lib/kakin/cli.rb

@@ -3,9 +3,9 @@ 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'
 require 'thor'
 
 module Kakin
@@ -15,7 +15,8 @@ module Kakin
     option :f, type: :string, banner: "<file>", desc: "cost define file(yaml)", required: true
     option :s, type: :string, banner: "<start>", desc: "start time", default: (DateTime.now << 1).strftime("%Y-%m-01")
     option :e, type: :string, banner: "<end>", desc: "end time", default: Time.now.strftime("%Y-%m-01")
-    option :t, type: :string, banner: "<tenant>", desc: "specify tenant", default: ""
+    option :t, type: :array, banner: "<tenant>", desc: "specify tenants"
+    option :S, type: :array, banner: "<tenant>", desc: "skip tenants", default: []
     desc 'calc', 'Calculate the cost'
     def calc
       Kakin::Configuration.setup
@@ -23,54 +24,47 @@ module Kakin
       yaml = YAML.load_file(options[:f])
       start_time = Time.parse(options[:s]).strftime("%FT%T")
       end_time = Time.parse(options[:e]).strftime("%FT%T")
+      skip = options[:S]
+      tenants = if tenants = options[:t]
+        tenants.map do |tenant|
+          Yao.tenant_klass.get(tenant)
+        end
+      else
+        Yao.tenant_klass.list
+      end.select do |tenant|
+        name = tenant.name || tenant.id
+        !skip.include?(name)
+      end
 
       STDERR.puts "Start: #{start_time}"
       STDERR.puts "End:   #{end_time}"
-      client = Yao.default_client.pool['compute']
-      tenant_id = Yao::Tenant.get_by_name(Kakin::Configuration.tenant).id
-      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 = res.body["tenant_usages"]
-        tenants = Yao::Tenant.list
-
-        unless options[:t].empty?
-          tenant = tenants.find { |tenant| tenant.name == options[:t] }
-          raise "Not Found tenant #{options[:t]}" unless tenant
 
-          tenant_usages = tenant_usages.select { |tenant_usage| tenant_usage["tenant_id"] == tenant.id }
-        end
-
-        tenant_usages.each do |usage|
-          tenant = tenants.find { |tenant| tenant.id == usage["tenant_id"] }
-
-          total_vcpus_usage     = usage["total_vcpus_usage"]
-          total_memory_mb_usage = usage["total_memory_mb_usage"]
-          total_local_gb_usage  = usage["total_local_gb_usage"]
-
-          bill_vcpu   = total_vcpus_usage * yaml["vcpu_per_hour"]
-          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] = {
-            'bill_total'            => bill_vcpu + bill_memory + bill_disk,
-            'bill_vcpu'             => bill_vcpu,
-            'bill_memory'           => bill_memory,
-            'bill_disk'             => bill_disk,
-            'total_hours'           => usage["total_hours"],
-            'total_vcpus_usage'     => total_vcpus_usage,
-            'total_memory_mb_usage' => total_memory_mb_usage,
-            'total_local_gb_usage'  => total_local_gb_usage,
-          }
-        end
-
-        puts YAML.dump(result)
+      result = tenants.each_with_object({}) do |tenant, result|
+        usage = tenant.server_usage(start: start_time, end: end_time)
+        next if usage.empty?
+
+        total_vcpus_usage     = usage["total_vcpus_usage"]
+        total_memory_mb_usage = usage["total_memory_mb_usage"]
+        total_local_gb_usage  = usage["total_local_gb_usage"]
+
+        bill_vcpu   = total_vcpus_usage * yaml["vcpu_per_hour"]
+        bill_memory = total_memory_mb_usage * yaml["memory_mb_per_hour"]
+        bill_disk   = total_local_gb_usage * yaml["disk_gb_per_hour"]
+
+        name = tenant.name || tenant.id
+        result[name] = {
+          'bill_total'            => bill_vcpu + bill_memory + bill_disk,
+          'bill_vcpu'             => bill_vcpu,
+          'bill_memory'           => bill_memory,
+          'bill_disk'             => bill_disk,
+          'total_hours'           => usage["total_hours"],
+          'total_vcpus_usage'     => total_vcpus_usage,
+          'total_memory_mb_usage' => total_memory_mb_usage,
+          'total_local_gb_usage'  => total_local_gb_usage,
+        }
       end
+
+      puts YAML.dump(result)
     end
 
     option :f, type: :string, banner: "<file>", desc: "cost define file(yaml)", required: true
@@ -90,9 +84,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)
 
@@ -120,15 +114,15 @@ 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)
 
       tenants.each do |tenant|
         count = tenant.ports.select {|p| p.fixed_ips[0]["ip_address"] =~ ip_regexp}.count
-        count += Yao::NetworkingFloatingIP.list(tenant_id: tenant.id).select {|p| p.floating_ip_address =~ ip_regexp}.count
+        count += Yao::FloatingIP.list(tenant_id: tenant.id).select {|p| p.floating_ip_address =~ ip_regexp}.count
         result[tenant.name] = {
           'count'       => count,
           'total_usage' => count * yaml["cost_per_ip"],
@@ -147,9 +141,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

data/lib/kakin/configuration.rb

@@ -13,6 +13,7 @@ module Kakin
         'password'             => ENV['OS_PASSWORD'],
         'client_cert'          => ENV['OS_CERT'],
         'client_key'           => ENV['OS_KEY'],
+        'ca_cert'              => ENV['OS_CACERT'],
         'identity_api_version' => ENV['OS_IDENTITY_API_VERSION'],
         'user_domain_name'     => ENV['OS_USER_DOMAIN_NAME'],
         'project_domain_name'  => ENV['OS_PROJECT_DOMAIN_NAME'],
@@ -35,6 +36,7 @@ module Kakin
         username config['username']
         password config['password']
         timeout config['timeout'].to_i if config['timeout']
+        ca_cert config['ca_cert'] if config['ca_cert']
         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']

data/lib/kakin/version.rb

@@ -1,3 +1,3 @@
 module Kakin
-  VERSION = "0.3.1"
+  VERSION = "0.5.0"
 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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kakin
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - buty4649
 - SHIBATA Hiroshi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -31,42 +31,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -104,13 +104,13 @@ files:
 - lib/kakin/cli.rb
 - lib/kakin/configuration.rb
 - lib/kakin/version.rb
-- 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: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: kakin is resource calcuration tool for OpenStack
 test_files: []

data/lib/kakin/yao_ext/floatingip.rb

@@ -1,9 +0,0 @@
-module Yao::Resources
-  class NetworkingFloatingIP < Base
-    friendly_attributes :floating_network_id, :floating_ip_address, :port_id
-
-    self.service        = "network"
-    self.resource_name  = "floatingip"
-    self.resources_name = "floatingips"
-  end
-end