yao 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a30ea9865b8d2944f386d9fe9cfc843a6414b1de2fe3fa53f0515c6679042697
-  data.tar.gz: 3e3ff0f51fccd67726f8e70e5801db2299963d7627898312a4640e37027bc8ad
+  metadata.gz: 4995f4848c6b4d4fe74b39999648c0d1fe4cb473d086ea35017ad5d7611b07e3
+  data.tar.gz: 6fddaff2cd5e2118f7652559e7f3d3f36cceb03961c39c4e54d9cd940f6f733e
 SHA512:
-  metadata.gz: 7b13454b9f63ce5388d5f5402a7b75db56a23a080ede490748d9928ac2a96e6d094418e3e247b120a3d41224d7896e732d1e8a19d12d13c84e0a73a9dc3d86d9
-  data.tar.gz: a3fdc1732d6d1853c612a204180968f6a62accddf65c66b74983f23bacbfd89bf699e4bb30086c6e10ba9eaefa7976ed8357b9da7e32c98bc046dd60f394d206
+  metadata.gz: d3d72831ab303bac1453d3cfeda3e98f73554ebc3960d324cb4d701d4f15e59c0d90279c249e64bfc5b598e805b8f1b2647c21dbcf798845a38c8d7c9822ba76
+  data.tar.gz: 9c5b6ab144c089554c0c245ec93ecce895d14121447c7f70058cfa8e6e8682e71190a0c1d8776b89d6f0994183f40c8fd6df9de24e05a96ba162e88eac291c52

data/lib/yao/resources/aggregates.rb

@@ -4,10 +4,9 @@ module Yao::Resources
   class Aggregates < Base
     friendly_attributes :availability_zone, :deleted, :hosts, :metadata, :name
 
-    # @return [Date]
-    def deleted_at
-      Date.parse(self["deleted_at"]) if self["deleted_at"]
-    end
+    map_attributes_to_time :created_at, :updated_at, :deleted_at
+    alias :created :created_at
+    alias :updated :updated_at
 
     self.service        = "compute"
     self.resources_name = "aggregates"

data/lib/yao/resources/base.rb

@@ -4,9 +4,22 @@ require 'time'
 module Yao::Resources
   class Base
 
+    # @param name [String]
+    def self.add_instantiation_name_list(name)
+      @instantiation_list ||= []
+      @instantiation_list << name
+    end
+
+    # @param name [String]
+    # @return [bool]
+    def self.instantiation?(name)
+      @instantiation_list.include?(name)
+    end
+
     # @param name [Array]
     def self.friendly_attributes(*names)
       names.map(&:to_s).each do |name|
+        add_instantiation_name_list(name)
         define_method(name) do
           self[name]
         end
@@ -17,6 +30,7 @@ module Yao::Resources
     # @return [Symbol]
     def self.map_attribute_to_attribute(k_and_v)
       as_json, as_method = *k_and_v.to_a.first.map(&:to_s)
+      add_instantiation_name_list(as_method)
       define_method(as_method) do
         self[as_json]
       end
@@ -27,6 +41,7 @@ module Yao::Resources
     def self.map_attribute_to_resource(k_and_v)
       _name, klass = *k_and_v.to_a.first
       name = _name.to_s
+      add_instantiation_name_list(name)
       define_method(name) do
         unless self[name].empty?
           self[[name, klass].join("__")] ||= klass.new(self[name])
@@ -39,6 +54,7 @@ module Yao::Resources
     def self.map_attribute_to_resources(k_and_v)
       _name, klass = *k_and_v.to_a.first
       name = _name.to_s
+      add_instantiation_name_list(name)
       define_method(name) do
         self[[name, klass].join("__")] ||= self[name].map {|d|
           klass.new(d)
@@ -46,6 +62,17 @@ module Yao::Resources
       end
     end
 
+    # @param names [Array<Symbol>]
+    # @return [Symbol]
+    def self.map_attributes_to_time(*names)
+      names.map(&:to_s).each do |name|
+        add_instantiation_name_list(name)
+        define_method(name) do
+          Time.parse(self[name])
+        end
+      end
+    end
+
     # @param data_via_json [Hash]
     # @return [Hash]
     def initialize(data_via_json)
@@ -55,7 +82,7 @@ module Yao::Resources
     # @param name [String]
     # @return [String]
     def [](name)
-      unless @data["id"].nil? || @data.key?(name) || name.include?("__")
+      if @data["id"] && !@data.key?(name) && self.class.instantiation?(name)
         @data = self.class.get(@data["id"]).to_hash
       end
       @data[name]
@@ -78,20 +105,6 @@ module Yao::Resources
       self["id"]
     end
 
-    # @return [Date]
-    def created
-      if date = self["created_at"] || self["created"]
-        Time.parse(date)
-      end
-    end
-
-    # @return [Date]
-    def updated
-      if date = self["updated_at"] || self["updated"]
-        Time.parse(date)
-      end
-    end
-
     # @param resource_params [Hash]
     # @return [Yao::Resources::*]
     def update(resource_params)

data/lib/yao/resources/compute_services.rb

@@ -2,6 +2,9 @@ module Yao::Resources
   class ComputeServices < Base
     friendly_attributes  :status, :binary, :host, :zone, :state, :disabled_reason, :forced_down
 
+    map_attributes_to_time :updated_at
+    alias :updated :updated_at
+
     self.service        = "compute"
     self.resource_name  = "service"
     self.resources_name = "os-services"

data/lib/yao/resources/floating_ip.rb

@@ -10,6 +10,10 @@ module Yao::Resources
                         :floating_ip_address,
                         :status, :port_details, :tags, :port_forwardings
 
+    map_attributes_to_time :created_at, :updated_at
+    alias :created :created_at
+    alias :updated :updated_at
+
     self.service        = "network"
     self.resource_name  = "floatingip"
     self.resources_name = "floatingips"

data/lib/yao/resources/loadbalancer.rb

@@ -6,6 +6,10 @@ module Yao::Resources
     map_attribute_to_resources listeners: LoadBalancerListener
     map_attribute_to_resources pools: LoadBalancerPool
 
+    map_attributes_to_time :created_at, :updated_at
+    alias :created :created_at
+    alias :updated :updated_at
+
     # @return [Yao::Resources::Tenant]
     def project
       if project_id = self["project_id"]

data/lib/yao/resources/loadbalancer_healthmonitor.rb

@@ -7,6 +7,10 @@ module Yao::Resources
 
     map_attribute_to_resources pools: LoadBalancerListener
 
+    map_attributes_to_time :created_at, :updated_at
+    alias :created :created_at
+    alias :updated :updated_at
+
     # @return [Date]
     def created_at
       Date.parse(self["created_at"])

data/lib/yao/resources/loadbalancer_listener.rb

@@ -8,6 +8,10 @@ module Yao::Resources
 
     map_attribute_to_resources loadbalancers: LoadBalancer
 
+    map_attributes_to_time :created_at, :updated_at
+    alias :created :created_at
+    alias :updated :updated_at
+
     # @return [Yao::Resources::Tenant]
     def project
       if project_id = self["project_id"]

data/lib/yao/resources/loadbalancer_pool.rb

@@ -7,6 +7,10 @@ module Yao::Resources
     map_attribute_to_resources loadbalancers: LoadBalancer
     map_attribute_to_resources listeners: LoadBalancerListener
 
+    map_attributes_to_time :created_at, :updated_at
+    alias :created :created_at
+    alias :updated :updated_at
+
     # @return [Yao::Resources::LoadBalancerListener]
     def listeners
       @listeners ||= self["listeners"].map do |listener|

data/lib/yao/resources/loadbalancer_pool_member.rb

@@ -5,6 +5,10 @@ module Yao::Resources
                         :monitor_address, :address,
                         :protocol_port, :operating_status
 
+    map_attributes_to_time :created_at, :updated_at
+    alias :created :created_at
+    alias :updated :updated_at
+
     # @return [Yao::Resources::Tenant]
     def project
       if project_id = self["project_id"]

data/lib/yao/resources/server.rb

@@ -20,6 +20,10 @@ module Yao::Resources
     map_attribute_to_attribute 'OS-EXT-STS:task_state'               => :ext_sts_task_state
     map_attribute_to_attribute 'OS-EXT-STS:vm_state'                 => :ext_sts_vm_state
 
+    map_attributes_to_time :created, :updated
+    alias :created_at :created
+    alias :updated_at :updated
+
     self.service        = "compute"
     self.resource_name  = "server"
     self.resources_name = "servers"
@@ -43,6 +47,52 @@ module Yao::Resources
       action(id, "os-start" => nil)
     end
 
+    # @return [Hash]
+    def start
+      self.class.start(id)
+    end
+
+    # @return [Hash]
+    def shutoff
+      self.class.shutoff(id)
+    end
+    alias :stop :shutoff
+
+    # @return [Hash]
+    def reboot
+      self.class.reboot(id)
+    end
+
+    # @return [Hash]
+    def resize(flavor_id)
+      self.class.resize(id, flavor_id)
+    end
+
+    # @param id [String]
+    # @param host [String]
+    # @param block_migration [Boolean]
+    # @param disk_over_commit [Boolean]
+    # @param opts [Hash]
+    # @return [Hash]
+    def live_migrate(host = nil, block_migration = false, disk_over_commit = false, opts = {})
+      self.class.live_migrate(id, host, block_migration, disk_over_commit, opts)
+    end
+
+    # @return [Hash]
+    def add_security_group(sg_name)
+      self.class.add_security_group(id, sg_name)
+    end
+
+    # @return [Hash]
+    def remove_security_group(sg_name)
+      self.class.remove_security_group(id, sg_name)
+    end
+
+    # @return [Hash]
+    def get_vnc_console
+      self.class.get_vnc_console(id)
+    end
+
     # @param id [String]
     # @return [Hash]
     def self.shutoff(id)
@@ -62,6 +112,21 @@ module Yao::Resources
       action(id,"resize" => { "flavorRef" => flavor_id })
     end
 
+    # @param id [String]
+    # @param host [String]
+    # @param block_migration [Boolean]
+    # @param disk_over_commit [Boolean]
+    # @param opts [Hash]
+    # @return [Hash]
+    def self.live_migrate(id, host = nil, block_migration = false, disk_over_commit = false, opts ={})
+      query = {
+        "host" => host,
+        "block_migration" => block_migration,
+        "disk_over_commit" => disk_over_commit,
+      }.merge(opts)
+      action(id, "os-migrateLive" => query)
+    end
+
     # @param id [String]
     # @param sg_name [String]
     # @return [Hash]
@@ -77,7 +142,7 @@ module Yao::Resources
     end
 
     # @param id [String]
-    # @return [Hash]
+    # @return [String]
     def self.get_vnc_console(id)
       response = action(id, {"os-getVNCConsole": {"type": "novnc"}})
       response.dig("console", "url")

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/test/support/restfully_accesible_stub.rb

@@ -40,6 +40,17 @@ module RestfullyAccessibleStub
       )
   end
 
+  def stub_post_request(url, body, response = {})
+    stub_request(:post,url)
+      .with(
+        headers: request_headers
+      ).to_return(
+        status: 202,
+        headers: {'Content-Type' => 'application/json'},
+        body: response.to_json
+      )
+  end
+
   def request_headers
     {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"}
   end

data/test/yao/resources/test_aggregates.rb

@@ -19,6 +19,6 @@ class TestAggregates < TestYaoResource
     assert_equal("nova", aggregates.name)
     assert_equal(Time.parse("2015-08-27T09:49:58-05:00"), aggregates.created)
     assert_equal(Time.parse("2015-08-27T09:49:58-05:00"), aggregates.updated)
-    assert_equal(Date.parse("2015-08-27T09:49:58-05:00"), aggregates.deleted_at)
+    assert_equal(Time.parse("2015-08-27T09:49:58-05:00"), aggregates.deleted_at)
   end
 end

data/test/yao/resources/test_server.rb

@@ -1,4 +1,5 @@
 class TestServer < TestYaoResource
+  include RestfullyAccessibleStub
 
   def test_server
 
@@ -273,4 +274,98 @@ class TestServer < TestYaoResource
     assert_equal(0, ports.size)
     assert_requested(stub)
   end
+
+  def test_start
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"os-start": nil}]
+    )
+
+    Yao::Server.new('id' => server_id).start
+    assert_requested(stub)
+  end
+
+  def test_shutoff
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"os-stop": nil}]
+    )
+
+    Yao::Server.new('id' => server_id).stop
+    assert_requested(stub)
+    assert_equal(Yao::Server.method(:stop), Yao::Server.method(:shutoff))
+  end
+
+  def test_reboot
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"reboot": { "type" => "HARD" }}]
+    )
+
+    Yao::Server.new('id' => server_id).reboot
+    assert_requested(stub)
+  end
+
+  def test_resize
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"resize": { "flavorRef": "test-flavor" }}]
+    )
+
+    Yao::Server.new('id' => server_id).resize("test-flavor")
+    assert_requested(stub)
+  end
+
+  def test_live_migrate
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"os-migrateLive": {
+          "host": "test-node-1",
+          "block_migration": false,
+          "disk_over_commit": false
+        }}]
+    )
+
+    Yao::Server.new('id' => server_id).live_migrate("test-node-1", false, false)
+    assert_requested(stub)
+  end
+
+  def test_add_security_group
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"addSecurityGroup": { "name": "test-sg" }}]
+    )
+
+    Yao::Server.new('id' => server_id).add_security_group("test-sg")
+    assert_requested(stub)
+  end
+
+  def test_remove_security_group
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"removeSecurityGroup": { "name": "test-sg" }}]
+    )
+
+    Yao::Server.new('id' => server_id).remove_security_group("test-sg")
+    assert_requested(stub)
+  end
+
+  def test_get_vnc_concolse
+    server_id = '2ce4c5b3-2866-4972-93ce-77a2ea46a7f9'
+    stub = stub_post_request(
+      "https://example.com:12345/servers/#{server_id}/action",
+      [{"os-getVNCConsole": { "type": "novnc" }}],
+      {"console": { "url": "https://example.com/vnc" }}
+    )
+
+    Yao::Server.new('id' => server_id).get_vnc_console
+    assert_requested(stub)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json