yao 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b1d157a6a9fbf7bb533bf9bf95755c44fc29f76a412c71a492ca849310fefb
-  data.tar.gz: 93fe712c7e19d8a007c29258d9c3f619df4765bf6934e10937121fec77afcdb6
+  metadata.gz: 97e6146fda8345c89f804cb55928c3011e8603999355e27e5416d13eb336e569
+  data.tar.gz: b47ac5d66e43b08e2482f157c13ff9fa45a335b8ac6992737d6554d08a2c4ca3
 SHA512:
-  metadata.gz: 449ee882dafffefe8839b0fd39d857e15801967e4c73b650e39412d14c0121d833a3b11ff1c875b6de5ecd94d4da1a33424e5bf19a36ea58a7a4e8e639251cb5
-  data.tar.gz: 443e2353eadf6df3c5f6b357d46f7c23d8fa4a87ff493f11f0e82c14d47562e9a5670cf88d2f6043992a64c7d5e8368eb15525ee6c57b1890f9464f6ff1822c7
+  metadata.gz: f4066fa6911823b55df1b9e61d6796b3efa7719b7dc6afb4858b1daf28153bf16754aed5f4646fdbbbf8a80b540235f2cbf0d763c98e8ec428d1d8de7cb78077
+  data.tar.gz: 545be1baceecc9ad556b207f19e01dc2658a37321038225707643005f802cbbbfea57f7fba5ba581ad4df1d1a7f2c331d4168ff7ee13c181f2ffb2f7d43056ff

data/.github/workflows/macos.yml

@@ -0,0 +1,15 @@
+name: macos
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: bundle exec rake test

data/.github/workflows/ubuntu-rvm.yml

@@ -0,0 +1,29 @@
+name: ubuntu-rvm
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ 'ruby-head' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up RVM
+      run: |
+        curl -sSL https://get.rvm.io | bash
+    - name: Set up Ruby
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        rvm install ${{ matrix.ruby }} --binary
+        rvm --default use ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        bundle exec rake test

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,22 @@
+name: ubuntu
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: bundle exec rake test

data/Gemfile

@@ -3,5 +3,13 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in yao.gemspec
 gemspec
 
-gem 'travis'
-gem 'rubocop'
+group :development do
+  gem 'rubocop'
+  gem "bundler", ">= 1.10"
+  gem "rake", "~> 10.0"
+  gem "test-unit", ">= 3"
+  gem "test-unit-rr"
+  gem "power_assert"
+  gem "pry"
+  gem "webmock"
+end

data/README.md

@@ -2,7 +2,7 @@
 
 ![Logo](./yao-logo.png)
 
-YAO is a Yet Another OpenStack API Wrapper that rocks!! [![Build Status](https://travis-ci.org/yaocloud/yao.svg)](https://travis-ci.org/yaocloud/yao)
+YAO is a Yet Another OpenStack API Wrapper that rocks!!
 
 ## Installation
 
@@ -43,7 +43,7 @@ Yao.configure do
 end
 
 Yao::Network.list # list up networks...
-Yao::Server.list_detail # list up instances...
+Yao::Server.list # list up instances...
 ```
 
 If you want to override some of endpoints by service, you can do:
@@ -79,7 +79,7 @@ OpenStack.configure do
   password    "tonk0tsu-r@men"
 end
 
-OpenStack::Server.list_detail # And let's go on
+OpenStack::Server.list # And let's go on
 ```
 
 ## Contributing

data/lib/yao/resources.rb

@@ -1,6 +1,9 @@
 module Yao
   module Resources
     require "yao/resources/base"
+    require "yao/resources/tenant_associationable"
+    require "yao/resources/port_associationable"
+    require "yao/resources/network_associationable"
 
     autoload :Server,                    "yao/resources/server"
     autoload :Flavor,                    "yao/resources/flavor"
@@ -27,6 +30,8 @@ module Yao
     autoload :RoleAssignment,            "yao/resources/role_assignment"
     autoload :Volume,                    "yao/resources/volume"
     autoload :VolumeType,                "yao/resources/volume_type"
+    autoload :ComputeServices,           "yao/resources/compute_services"
+    autoload :Project,                   "yao/resources/project"
 
     autoload :Resource,                  "yao/resources/resource"
     autoload :Meter,                     "yao/resources/meter"

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 ? return_resource(resource_from_json(res.body)) : nil
+      res.body ? resource_from_json(res.body) : nil
     end
 
     private

data/lib/yao/resources/compute_services.rb

@@ -0,0 +1,46 @@
+module Yao::Resources
+  class ComputeServices < Base
+    friendly_attributes  :status, :binary, :host, :zone, :state, :disabled_reason, :forced_down
+
+    self.service        = "compute"
+    self.resource_name  = "service"
+    self.resources_name = "os-services"
+
+    class << self
+      def enable(host, binary)
+        params = {
+          "host" => host,
+          "binary" => binary,
+        }
+        put("enable", params)
+      end
+
+      def disable(host, binary, reason = nil)
+        params = {
+          "host" => host,
+          "binary" => binary,
+        }
+        if reason
+          params["disabled_reason"] = reason
+          put("disable-log-reason", params)
+        else
+          put("disable", params)
+        end
+      end
+
+      private
+
+      # @param path [String]
+      # @param  params [Hash]
+      # @return [Yao::Resources::ComputeServices]
+      def put(path, params)
+        res = PUT(create_url(path), params) do |req|
+          req.body = params.to_json
+          req.headers['Content-Type'] = 'application/json'
+        end
+        resource_from_json(res.body)
+      end
+    end
+
+  end
+end

data/lib/yao/resources/flavor.rb

@@ -17,15 +17,6 @@ module Yao::Resources
     self.service        = "compute"
     self.resource_name  = "flavor"
     self.resources_name = "flavors"
-
-    class << self
-      def list_detail(query={})
-        return_resources(
-          resources_from_json(
-            GET([resources_path, "detail"].join("/"), query).body
-          )
-        )
-      end
-    end
+    self.resources_detail_available = true
   end
 end

data/lib/yao/resources/floating_ip.rb

@@ -1,9 +1,13 @@
 module Yao::Resources
   class FloatingIP < Base
+
+    include PortAssociationable
+    include TenantAssociationable
+
     friendly_attributes :router_id, :description, :dns_domain, :dns_name,
-                        :revision_number, :project_id, :tenant_id,
+                        :revision_number,
                         :floating_network_id, :fixed_ip_address,
-                        :floating_ip_address, :port_id,
+                        :floating_ip_address,
                         :status, :port_details, :tags, :port_forwardings
 
     self.service        = "network"
@@ -18,9 +22,5 @@ module Yao::Resources
       @project ||= Yao::Tenant.get(project_id)
     end
     alias :tenant :project
-
-    def port
-      @port ||= Yao::Port.find(port_id)
-    end
   end
 end

data/lib/yao/resources/hypervisor.rb

@@ -22,26 +22,20 @@ module Yao::Resources
     self.service        = "compute"
     self.resource_name  = "os-hypervisor"
     self.resources_name = "os-hypervisors"
+    self.resources_detail_available = true
 
     class << self
-      def list_detail(query={})
-        return_resources(
-          resources_from_json(
-            GET([resources_path, "detail"].join("/"), query).body
-          )
-        )
-      end
-
+      # @return [Yao::Resources::Hypervisor::Statistics]
       def statistics
         json = GET([resources_path, "statistics"].join("/")).body
         Yao::Resources::Hypervisor::Statistics.new(json["hypervisor_statistics"])
       end
 
+      # @param id [String]
+      # @return [Yao::Resources::Hypervisor::Uptime]
       def uptime(id)
-        res = resource_from_json(
-                GET([resources_path, id, "uptime"].join("/")).body
-              )
-        Yao::Resources::Hypervisor::Uptime.new(res)
+        json = GET([resources_path, id, "uptime"].join("/")).body
+        Yao::Resources::Hypervisor::Uptime.new(json["hypervisor"])
       end
     end
 

data/lib/yao/resources/keypair.rb

@@ -6,10 +6,29 @@ module Yao::Resources
     self.resource_name  = "os-keypair"
     self.resources_name = "os-keypairs"
 
+    # os-keypairs API returns very complicated JSON.
+    # For example.
+    # {
+    #   "keypairs": [
+    #     {
+    #       "keypair": {
+    #          "fingerprint": "...",
+    #        }
+    #     },
+    #     {
+    #       "keypair": {
+    #          "fingerprint": "...",
+    #        }
+    #     },
+    #   ]
+    #
+    # @param query [Hash]
+    # @return [Array<Yao::Resources::Keypairs>]
     def self.list(query={})
-      return_resources(
-        resources_from_json(GET(resources_name, query).body).map{|r| resource_from_json(r)}
-      )
+      res = GET(resources_name, query)
+      res.body['keypairs'].map { |attribute|
+        new(attribute['keypair'])
+      }
     end
   end
 end

data/lib/yao/resources/meter.rb

@@ -1,6 +1,9 @@
 module Yao::Resources
   class Meter < Base
-    friendly_attributes :meter_id, :name, :user_id, :resource_id, :project_id, :source, :type, :unit
+
+    include TenantAssociationable
+
+    friendly_attributes :meter_id, :name, :user_id, :resource_id, :source, :type, :unit
 
     def id
       meter_id
@@ -10,10 +13,6 @@ module Yao::Resources
       @resource ||= Yao::Resource.get(resource_id)
     end
 
-    def tenant
-      @tenant ||= Yao::Tenant.get(project_id)
-    end
-
     def user
       @user ||= Yao::User.get(user_id)
     end
@@ -25,11 +24,11 @@ module Yao::Resources
     class << self
       private
       def resource_from_json(json)
-        json
+        new(json)
       end
 
       def resources_from_json(json)
-        json
+        new(json)
       end
     end
   end

data/lib/yao/resources/network.rb

@@ -1,6 +1,8 @@
 module Yao::Resources
   class Network < Base
-    friendly_attributes :name, :status, :shared, :tenant_id, :subnets, :admin_state_up
+    include TenantAssociationable
+
+    friendly_attributes :name, :status, :shared, :subnets, :admin_state_up
     map_attribute_to_attribute "provider:physical_network" => :physical_network
     map_attribute_to_attribute "provider:network_type"     => :type
     map_attribute_to_attribute "provider:segmentation_id"  => :segmentation_id

data/lib/yao/resources/network_associationable.rb

@@ -0,0 +1,14 @@
+module Yao
+  module Resources
+    module NetworkAssociationable
+
+      def self.included(base)
+        base.friendly_attributes :network_id
+      end
+
+      def network
+        @tenant ||= Yao::Network.find(network_id)
+      end
+    end
+  end
+end

data/lib/yao/resources/old_sample.rb

@@ -1,7 +1,9 @@
 module Yao::Resources
   class OldSample < Base
+    include TenantAssociationable
+
     friendly_attributes :counter_name, :counter_type, :counter_unit, :counter_volume,
-                        :message_id, :project_id, :resource_id, :timestamp, :resource_metadata, :user_id,
+                        :message_id, :resource_id, :timestamp, :resource_metadata, :user_id,
                         :source
 
     def recorded_at
@@ -10,17 +12,13 @@ module Yao::Resources
     alias timestamp recorded_at
 
     def id
-      meter_id
+      message_id
     end
 
     def resource
       @resource ||= Yao::Resource.get(resource_id)
     end
 
-    def tenant
-      @tenant ||= Yao::Tenant.get(project_id)
-    end
-
     def user
       @user ||= Yao::User.get(user_id)
     end
@@ -32,7 +30,7 @@ module Yao::Resources
     def self.list(meter_name, query={})
       cache_key = [meter_name, *query].join
       cache[cache_key] = GET("#{self.api_version}/meters/#{meter_name}", query).body unless cache[cache_key]
-      return_resources(cache[cache_key])
+      new(cache[cache_key])
     end
 
     def self.cache

data/lib/yao/resources/port.rb

@@ -1,8 +1,12 @@
 module Yao::Resources
   class Port < Base
+
+    include NetworkAssociationable
+    include TenantAssociationable
+
     friendly_attributes :name, :mac_address, :status, :allowed_address_pairs,
                         :device_owner, :fixed_ips, :security_groups, :device_id,
-                        :network_id, :tenant_id, :admin_state_up
+                        :admin_state_up
     map_attribute_to_attribute "binding:host_id" => :host_id
 
     def primary_ip
@@ -10,11 +14,7 @@ module Yao::Resources
     end
 
     def primary_subnet
-      Yao::Subnet.find fixed_ips.first["subnet_id"]
-    end
-
-    def network
-      Yao::Network.find network_id
+      @subnet ||= Yao::Subnet.find fixed_ips.first["subnet_id"]
     end
 
     self.service        = "network"

data/lib/yao/resources/port_associationable.rb

@@ -0,0 +1,14 @@
+module Yao
+  module Resources
+    module PortAssociationable
+
+      def self.included(base)
+        base.friendly_attributes :port_id
+      end
+
+      def port
+        @port ||= Yao::Port.find(port_id)
+      end
+    end
+  end
+end