yao 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2ea8c98f6fdefadcfeca2782ed5dde20a91423afc3cc44b925a64fdee3b552a
-  data.tar.gz: a0993ca6bd8ddb9a222d632e98c77031682b492756be20c164632410da64bed4
+  metadata.gz: 30ea2f00c9ac02892a86b95ffd29c6dac6323d430fcc9656e053f7ceb0c55987
+  data.tar.gz: 174922729484e225f2d362f15a19fe5fad949c2e91ab7f301a858cd21eaf4073
 SHA512:
-  metadata.gz: aa2d0252174bc0e69a7697d6fb8e90aba053105fa416219bb5c7b0800a861fcffee6d1e48d0fdc3d84a38f20cb4790d8030dbafbae65f1548c221ae79dbd7e52
-  data.tar.gz: ccef8bca36eda0c7191017929f466a9b424ca8ac697e2e0f104519394ccdc022bd7159391ad1cfebbf9590635ca4b74c5a5705823b2fc54a27027877e252bcb5
+  metadata.gz: 97ef036c9655f766fa79475aaaa634067adc4f8f78c1521e5958de2a77f1360cfc504026e5b7321268f392062ea2b7f42c7ef84235696807945f5b766101a46b
+  data.tar.gz: 3e83cbce18a6e9a59d7fa23641e6309274a1f085082cfb9819c91a445dd45fb86333be02ba302685fed5428bd346d1bde1a1a3d7dc0d55094b703b8ec59ae6ef

data/lib/yao/resources/action.rb

@@ -5,7 +5,7 @@ module Yao::Resources
         req.body = query.to_json
         req.headers['Content-Type'] = 'application/json'
       end
-      res.body ? resource_from_json(res.body) : nil
+      res.body
     end
 
     private

data/lib/yao/resources/image.rb

@@ -25,5 +25,16 @@ module Yao::Resources
     self.resources_name = "images"
 
     extend MetadataAvailable
+
+    class << self
+      private
+
+      # override Yao::Resources::RestfullyAccessible.resource_from_json
+      # @param json [Hash]
+      # @return [Yao::Resources::*]
+      def resource_from_json(json)
+        new(json)
+      end
+    end
   end
 end

data/lib/yao/resources/server.rb

@@ -53,6 +53,11 @@ module Yao::Resources
       action(id, {"removeSecurityGroup": {"name": sg_name}})
     end
 
+    def self.get_vnc_console(id)
+      response = action(id, {"os-getVNCConsole": {"type": "novnc"}})
+      response.dig("console", "url")
+    end
+
     class << self
       alias :stop :shutoff
     end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/test/yao/resources/test_image.rb

@@ -1,44 +1,56 @@
 class TestImage < TestYaoResource
+  # https://docs.openstack.org/api-ref/compute/?expanded=list-flavors-detail,list-flavors-with-details-detail,list-hosts-detail,show-host-details-detail,list-images-detail,list-images-with-details-detail#list-images-with-details
+  @@params = {
+    "OS-DCF:diskConfig" => "AUTO",
+    "OS-EXT-IMG-SIZE:size" => 74185822,
+    "created" => "2011-01-01T01:02:03Z",
+    "id" => "70a599e0-31e7-49b7-b260-868f441e862b",
+    "links" => [
+      {
+        "href" => "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "rel" => "self"
+      },
+      {
+        "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "rel" => "bookmark"
+      },
+      {
+        "href" => "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "rel" => "alternate",
+        "type" => "application/vnd.openstack.image"
+      }
+    ],
+    "metadata" => {
+      "architecture" => "x86_64",
+      "auto_disk_config" => "True",
+      "kernel_id" => "nokernel",
+      "ramdisk_id" => "nokernel"
+    },
+    "minDisk" => 0,
+    "minRam" => 0,
+    "name" => "fakeimage7",
+    "progress" => 100,
+    "status" => "ACTIVE",
+    "updated" => "2011-01-01T01:02:03Z"
+  }
 
   def test_image
 
-    # https://docs.openstack.org/api-ref/compute/?expanded=list-flavors-detail,list-flavors-with-details-detail,list-hosts-detail,show-host-details-detail,list-images-detail,list-images-with-details-detail#list-images-with-details
-    params = {
-      "OS-DCF:diskConfig" => "AUTO",
-      "OS-EXT-IMG-SIZE:size" => 74185822,
-      "created" => "2011-01-01T01:02:03Z",
-      "id" => "70a599e0-31e7-49b7-b260-868f441e862b",
-      "links" => [
-        {
-          "href" => "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
-          "rel" => "self"
-        },
-        {
-          "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
-          "rel" => "bookmark"
-        },
-        {
-          "href" => "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
-          "rel" => "alternate",
-          "type" => "application/vnd.openstack.image"
-        }
-      ],
-      "metadata" => {
-        "architecture" => "x86_64",
-        "auto_disk_config" => "True",
-        "kernel_id" => "nokernel",
-        "ramdisk_id" => "nokernel"
-      },
-      "minDisk" => 0,
-      "minRam" => 0,
-      "name" => "fakeimage7",
-      "progress" => 100,
-      "status" => "ACTIVE",
-      "updated" => "2011-01-01T01:02:03Z"
-    }
+    image = Yao::Resources::Image.new(@@params)
+    check_image(image)
 
-    image = Yao::Image.new(params)
+  end
 
+  def test_resource_from_json
+
+    image = Yao::Resources::Image.send(:resource_from_json, @@params)
+    check_image(image)
+    
+  end
+
+  private
+
+  def check_image(image)
     # friendly_attributes
     assert_equal("fakeimage7", image.name)
     assert_equal("ACTIVE", image.status)
@@ -60,4 +72,5 @@ class TestImage < TestYaoResource
     assert_equal(70.74911308288574, image.size('M'))    #
     assert_equal(0.06909093074500561, image.size('G'))  #
   end
+
 end

data/test/yao/test_client.rb

@@ -8,27 +8,30 @@ class TestClient < Test::Unit::TestCase
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
     assert { cli.url_prefix.to_s == "http://cool-api.example.com:12345/v3.0" }
 
+    adapter = Faraday::Adapter::NetHttp
+    assert { cli.builder.adapter == adapter }
+
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
-      FaradayMiddleware::ParseJson,
-      Faraday::Adapter::NetHttp
+      FaradayMiddleware::ParseJson
     ]
     assert { cli.builder.handlers == handlers }
   end
 
   def test_gen_with_token
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0", token: "deadbeaf")
+    adapter = Faraday::Adapter::NetHttp
+    assert { cli.builder.adapter == adapter }
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
       Faraday::Request::OSToken,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
-      FaradayMiddleware::ParseJson,
-      Faraday::Adapter::NetHttp
+      FaradayMiddleware::ParseJson
     ]
     assert { cli.builder.handlers == handlers }
   end
@@ -37,6 +40,8 @@ class TestClient < Test::Unit::TestCase
     stub(Yao.config).debug { true }
 
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
+    adapter = Faraday::Adapter::NetHttp
+    assert { cli.builder.adapter == adapter }
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
@@ -44,8 +49,7 @@ class TestClient < Test::Unit::TestCase
       Faraday::Response::OSErrorDetector,
       FaradayMiddleware::ParseJson,
       Faraday::Response::Logger,
-      Faraday::Response::OSDumper,
-      Faraday::Adapter::NetHttp
+      Faraday::Response::OSDumper
     ]
     assert { cli.builder.handlers == handlers }
   end

data/test/yao/test_server_error.rb

@@ -1,8 +1,8 @@
 class TestServerError < Test::Unit::TestCase
   def test_detects_error_with_env
     env = Faraday::Env.new
-    env.body = {"itemNotFound"=>{"message"=>"Image not found.", "code"=>404}}
     env.status = 404
+    env.body = {"itemNotFound"=>{"message"=>"Image not found.", "code"=>404}}
 
     error = Yao::ServerError.detect(env)
     assert { error.is_a? Yao::ItemNotFound }
@@ -13,8 +13,8 @@ class TestServerError < Test::Unit::TestCase
 
   def test_anyway_returns_error
     env = Faraday::Env.new
-    env.body = "<html>Not found.</html>"
     env.status = 599
+    env.body = "<html>Not found.</html>"
 
     error = Yao::ServerError.detect(env)
     assert { error.is_a? Yao::ServerError }

data/yao.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "json"
-  spec.add_dependency "faraday"
+  spec.add_dependency "faraday", "~> 1.0.1"
   spec.add_dependency "faraday_middleware"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,16 +28,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement