kakin 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3bdc1d071c18078ed62113fda208987cb1a00acb
-  data.tar.gz: 5fef69e865080c33b8ad4c6acf27719e0f8e5057
+SHA256:
+  metadata.gz: ebf422b2753f94442bbec430a675014094d0081e20420b7f7f397c21a4fd9aa4
+  data.tar.gz: b19d006bc6c4202f00d7bf889f0149148f1b0bea636fbe07581d881a2a9c724f
 SHA512:
-  metadata.gz: fe4b4b84a4b7c3b3659af0a700cf2b1eaeb22fcdab2eb6a3b00cc3f4bba91e0c3c46517b66b0992eab56394608aac9806540756754d96e2d06bc998bee6923f4
-  data.tar.gz: 81c4ed52991a268bee1079e648c17c1ad49969189f42688d8a124a448873685bdbed1fcdb2c659c59a6151a9a83f4462d967c60edeef889b6e0436c24f708a62
+  metadata.gz: cd7f094711b96910701a9eb7194640582a3c523e94eeae4f01831dca3d1fe3ca6a20a231628b17cfc6f32915154365f083fa95265bea4254fbf8c8d5bb7fd61e
+  data.tar.gz: 36290ac5d2a916babf88bee40af0afbc03f54d16929663501104da2084af7bd4bbeb1c6234088e8f9f08e052eaf974f21cce337df53106072d3e4306887c4543

data/kakin.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'thor'
-  spec.add_dependency 'yao', '~> 0.2.13'
+  spec.add_dependency 'yao'
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/kakin/cli.rb

@@ -5,6 +5,7 @@ require 'net/http'
 require 'yao'
 require 'kakin/yao_ext/tenant'
 require 'kakin/yao_ext/server'
+require 'kakin/yao_ext/floatingip'
 require 'thor'
 
 module Kakin
@@ -129,6 +130,7 @@ module Kakin
 
       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
         result[tenant.name] = {
           'count'       => count,
           'total_usage' => count * yaml["cost_per_ip"],

data/lib/kakin/configuration.rb

@@ -21,6 +21,8 @@ module Kakin
         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']
       end
     end
   end

data/lib/kakin/version.rb

@@ -1,3 +1,3 @@
 module Kakin
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/kakin/yao_ext/floatingip.rb

@@ -0,0 +1,9 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kakin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - buty4649
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -29,16 +29,16 @@ dependencies:
   name: yao
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ 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
 homepage: https://github.com/yaocloud/kakin
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: kakin is resource calcuration tool for OpenStack