yao 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702078252e6e2c7094cc33a053772a8a41e97cf4a6687b95c8bbebdd5f6235f8
-  data.tar.gz: c3ab7f4a0373020a23c6dffaae57509a3488f1c0de116682ca69365f30ba9be9
+  metadata.gz: c6afbe0b92d49d396c515350a1600b3459d4a294094ad791c5a6f0c8036ea01e
+  data.tar.gz: c8f252ae02d42ac1146e2668e65951e68a77a47de35c67d963d706ba6dd36ffb
 SHA512:
-  metadata.gz: 8104f1077c1f3f0483a1ba79c89c94dbb766a09ca364c8a71dc83524b8a9300a1e85d17f9bd18415ed4da16abb84f5d4f0074a3ac4762d114f16d846b8659199
-  data.tar.gz: b48cde484c266bff8d29218ecb53692d3f3ee3a014c363463f8fb4102e05c6cee504ecd8c13b7081100ca8367a7f31437dd90ff36423f2d2ad500154539e90bb
+  metadata.gz: 4164f302792447f21f755c86709fc17809cd722b1f37e76fd66cf849b0d49edeb1e24c5cf0369947e683398534ad952d43dd3bf0ded85becfba3fced434f1de9
+  data.tar.gz: 5302ff69a25fd1756c5ac92a1fa308a4a3c16eb3935167fe9cd0078520154d01a8eb33e240804601ea0a718cc70f593d07f225cf2c574d9ab35673a400a59127

data/lib/yao/resources.rb

@@ -15,6 +15,7 @@ module Yao
     autoload :Keypair,                   "yao/resources/keypair"
     autoload :FloatingIP,                "yao/resources/floating_ip"
     autoload :Network,                   "yao/resources/network"
+    autoload :NetworkingAgents,          "yao/resources/networking_agents"
     autoload :Subnet,                    "yao/resources/subnet"
     autoload :Port,                      "yao/resources/port"
     autoload :Router,                    "yao/resources/router"

data/lib/yao/resources/amphora.rb

@@ -0,0 +1,13 @@
+module Yao::Resources
+  class Amphora < Base
+    friendly_attributes :loadbalancer_id, :compute_id, :lb_network_ip, :vrrp_ip, :ha_ip, :vrrp_port_id,
+                        :ha_port_id, :role, :status, :vrrp_interface, :vrrp_id,
+                        :vrrp_priority, :cached_zone, :image_id, :compute_flavor
+
+    self.service        = "load-balancer"
+    self.api_version    = "v2"
+    self.resource_name  = "amphorae"
+    self.resources_name = "amphorae"
+    self.resources_path = "octavia/amphorae"
+  end
+end

data/lib/yao/resources/image.rb

@@ -19,7 +19,8 @@ module Yao::Resources
       end
     end
 
-    self.service        = "compute"
+    self.service        = "image"
+    self.api_version    = "v2"
     self.resource_name  = "image"
     self.resources_name = "images"
 

data/lib/yao/resources/loadbalancer.rb

@@ -1,7 +1,7 @@
 module Yao::Resources
   class LoadBalancer < Base
     friendly_attributes :provider, :description, :admin_state_up, :provisioning_status,
-                        :vip_address, :operationg_status, :name
+                        :vip_address, :operating_status, :name
 
     map_attribute_to_resources listeners: LoadBalancerListener
     map_attribute_to_resources pools: LoadBalancerListener

data/lib/yao/resources/network.rb

@@ -12,5 +12,9 @@ module Yao::Resources
     self.service        = "network"
     self.resource_name  = "network"
     self.resources_name = "networks"
+
+    def ports
+      @ports ||= Yao::Port.list(network_id: id)
+    end
   end
 end

data/lib/yao/resources/networking_agents.rb

@@ -0,0 +1,30 @@
+module Yao::Resources
+  class NetworkingAgents < Base
+
+    friendly_attributes :admin_state_up, :agent_type, :alive,
+                        :availability_zone, :binary, :configurations,
+                        :description, :heartbeat_timestamp, :host,
+                        :resources_synced, :topic
+
+    self.service        = "network"
+    self.resource_name  = "agents"
+    self.resources_name = "agents"
+
+    # @return [Date]
+    def created_at
+      Time.parse(self["created_at"])
+    end
+
+    # @return [Date]
+    def started_at
+      Time.parse(self["started_at"])
+    end
+
+    # @return [Date]
+    def heartbeat_timestamp
+      Time.parse(self["heartbeat_timestamp"])
+    end
+
+    alias :state :admin_state_up
+  end
+end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/test/support/restfully_accesible_stub.rb

@@ -1,4 +1,4 @@
-module RestfullAccessibleStub
+module RestfullyAccessibleStub
   def stub_get_request(url, resource_name)
     stub_request(:get, url)
       .with(
@@ -16,7 +16,7 @@ module RestfullAccessibleStub
       ).to_return(
         status: 200,
         headers: {'Content-Type' => 'application/json'},
-        body: body.to_json
+        body: body.class == String ? body : body.to_json
       )
   end
 

data/test/yao/resources/test_amphora.rb

@@ -0,0 +1,45 @@
+class TestLoadBalancer < TestYaoResource
+  def test_loadbalancer
+    # https://docs.openstack.org/api-ref/load-balancer/v2/?expanded=list-amphora-detail,show-amphora-statistics-detail#list-amphora
+    params = {
+        "id": "6bd55cd3-802e-447e-a518-1e74e23bb106",
+        "load_balancer_id": "09eedfc6-2c55-41a8-a75c-2cd4e95212ca",
+        "compute_id": "f0f79f90-733d-417a-8d70-cc6be62cd54d",
+        "lb_network_ip": "192.168.1.2",
+        "vrrp_ip": "192.168.1.5",
+        "ha_ip": "192.168.1.10",
+        "vrrp_port_id": "ab2a8add-76a9-44bb-89f8-88430193cc83",
+        "ha_port_id": "19561fd3-5da5-46cc-bdd3-99bbdf7246e6",
+        "cert_expiration": "2019-09-19 00:34:51",
+        "cert_busy": 0,
+        "role": "MASTER",
+        "status": "ALLOCATED",
+        "vrrp_interface": "eth1",
+        "vrrp_id": 1,
+        "vrrp_priority": 100,
+        "cached_zone": "zone1",
+        "created_at": "2017-05-10T18:14:44",
+        "updated_at": "2017-05-10T23:08:12",
+        "image_id": "c1c2ad6f-1c1e-4744-8d1a-d0ef36289e74",
+        "compute_flavor": "5446a14a-abec-4455-bc0e-a34e5ff001a3"
+    }
+
+    amphora = Yao::Resources::Amphora.new(params)
+    assert_equal("6bd55cd3-802e-447e-a518-1e74e23bb106", amphora.id)
+    assert_equal("09eedfc6-2c55-41a8-a75c-2cd4e95212ca", amphora.load_balancer_id)
+    assert_equal("f0f79f90-733d-417a-8d70-cc6be62cd54d", amphora.compute_id)
+    assert_equal("192.168.1.2", amphora.lb_network_ip)
+    assert_equal("192.168.1.5", amphora.vrrp_ip)
+    assert_equal("192.168.1.10", amphora.ha_ip)
+    assert_equal("ab2a8add-76a9-44bb-89f8-88430193cc83", amphora.vrrp_port_id)
+    assert_equal("19561fd3-5da5-46cc-bdd3-99bbdf7246e6", amphora.ha_port_id)
+    assert_equal("MASTER", amphora.role)
+    assert_equal("ALLOCATED", amphora.status)
+    assert_equal("eth1", amphora.vrrp_interface)
+    assert_equal(1, amphora.vrrp_id)
+    assert_equal(100, amphora.vrrp_priority)
+    assert_equal("zone1", amphora.cached_zone)
+    assert_equal("c1c2ad6f-1c1e-4744-8d1a-d0ef36289e74", amphora.image_id)
+    assert_equal("5446a14a-abec-4455-bc0e-a34e5ff001a3", amphora.compute_flavor)
+  end
+end

data/test/yao/resources/test_loadbalancer.rb

@@ -6,7 +6,7 @@ class TestLoadBalancer < TestYaoResource
       "admin_state_up" => true,
       "provisioning_status" => "ACTIVE",
       "vip_address" => "198.51.100.1",
-      "operationg_status" => "ONLINE",
+      "operating_status" => "ONLINE",
       "name" => "greate loadbalancer",
       "created_at" => "2017-02-28T00:41:44",
       "updated_at" => "2017-02-28T00:43:30",
@@ -18,7 +18,7 @@ class TestLoadBalancer < TestYaoResource
     assert_equal(true, lb.admin_state_up)
     assert_equal("ACTIVE", lb.provisioning_status)
     assert_equal("198.51.100.1", lb.vip_address)
-    assert_equal("ONLINE", lb.operationg_status)
+    assert_equal("ONLINE", lb.operating_status)
     assert_equal("greate loadbalancer", lb.name)
     assert_equal(Time.parse("2017-02-28T00:41:44"), lb.created)
     assert_equal(Time.parse("2017-02-28T00:43:30"), lb.updated)

data/test/yao/resources/test_network.rb

@@ -1,4 +1,5 @@
 class TestNetwork < TestYaoResource
+  include RestfullyAccessibleStub
 
   def test_network
 
@@ -62,4 +63,71 @@ class TestNetwork < TestYaoResource
 
     assert_requested(stub)
   end
+
+  def test_ports
+    network_id = "d80b1a3b-4fc1-49f3-952e-1e2ab7081d8b"
+    # https://docs.openstack.org/api-ref/network/v2/?expanded=list-floating-ips-detail,list-ports-detail#list-ports
+    body = <<-JSON
+    {
+      "ports": [
+          {
+              "admin_state_up": true,
+              "allowed_address_pairs": [],
+              "binding:host_id": "devstack",
+              "binding:profile": {},
+              "binding:vif_details": {
+                  "ovs_hybrid_plug": true,
+                  "port_filter": true
+              },
+              "binding:vif_type": "ovs",
+              "binding:vnic_type": "normal",
+              "created_at": "2016-03-08T20:19:41",
+              "data_plane_status": null,
+              "description": "",
+              "device_id": "9ae135f4-b6e0-4dad-9e91-3c223e385824",
+              "device_owner": "network:router_gateway",
+              "dns_assignment": {
+                  "hostname": "myport",
+                  "ip_address": "172.24.4.2",
+                  "fqdn": "myport.my-domain.org"
+              },
+              "dns_domain": "my-domain.org.",
+              "dns_name": "myport",
+              "extra_dhcp_opts": [],
+              "fixed_ips": [
+                  {
+                      "ip_address": "172.24.4.2",
+                      "subnet_id": "008ba151-0b8c-4a67-98b5-0d2b87666062"
+                  }
+              ],
+              "id": "d80b1a3b-4fc1-49f3-952e-1e2ab7081d8b",
+              "ip_allocation": "immediate",
+              "mac_address": "fa:16:3e:58:42:ed",
+              "name": "",
+              "network_id": "70c1db1f-b701-45bd-96e0-a313ee3430b3",
+              "port_security_enabled": true,
+              "project_id": "",
+              "revision_number": 1,
+              "security_groups": [],
+              "status": "ACTIVE",
+              "tenant_id": "",
+              "updated_at": "2016-03-08T20:19:41",
+              "qos_policy_id": "29d5e02e-d5ab-4929-bee4-4a9fc12e22ae",
+              "resource_request": {
+                  "required": ["CUSTOM_PHYSNET_PUBLIC", "CUSTOM_VNIC_TYPE_NORMAL"],
+                  "resources": {"NET_BW_EGR_KILOBIT_PER_SEC": 1000}
+              },
+              "tags": ["tag1,tag2"],
+              "tenant_id": "",
+              "uplink_status_propagation": false
+          }
+        ]
+      }
+      JSON
+    stub = stub_get_request_with_json_response("https://example.com:12345/ports?network_id=#{network_id}", body)
+    network = Yao::Network.new({"id" => network_id})
+    ports = network.ports
+    assert_equal(ports.first.id, "d80b1a3b-4fc1-49f3-952e-1e2ab7081d8b")
+    assert_requested(stub)
+  end
 end

data/test/yao/resources/test_networking_agents.rb

@@ -0,0 +1,84 @@
+class TestNetworkingAgents < TestYaoResource
+
+  def test_networking_agents
+
+    # https://docs.openstack.org/api-ref/network/v2/?expanded=list-all-agents-detail#list-all-agents
+    params = {
+      "binary" => "neutron-openvswitch-agent",
+      "description" => "aaa bbb ccc",
+      "availability_zone" => "zone",
+      "heartbeat_timestamp" => "2017-09-12 19:40:08",
+      "admin_state_up" => true,
+      "alive" => true,
+      "id" => "04c62b91-b799-48b7-9cd5-2982db6df9c6",
+      "topic" => "N/A",
+      "host" => "agenthost1",
+      "agent_type" => "Open vSwitch agent",
+      "started_at" => "2017-09-12 19:35:38",
+      "created_at" => "2017-09-12 19:35:38",
+      "resources_synced" => true,
+      "configurations" => {
+        "ovs_hybrid_plug" => true,
+        "in_distributed_mode" => false,
+        "datapath_type" => "system",
+        "vhostuser_socket_dir" => "/var/run/openvswitch",
+        "tunneling_ip" => "172.16.78.191",
+        "arp_responder_enabled" => false,
+        "devices" => 0,
+        "ovs_capabilities" => {
+          "datapath_types" => [
+            "netdev",
+            "system"
+          ],
+          "iface_types" => [
+            "geneve",
+            "gre",
+            "internal",
+            "ipsec_gre",
+            "lisp",
+            "patch",
+            "stt",
+            "system",
+            "tap",
+            "vxlan"
+          ]
+        },
+        "log_agent_heartbeats" => false,
+        "l2_population" => false,
+        "tunnel_types" => [
+          "vxlan"
+        ],
+        "extensions" => [
+        ],
+        "enable_distributed_routing" => false,
+        "bridge_mappings" => {
+          "public" => "br-ex"
+        }
+      }
+    }
+
+    agent = Yao::NetworkingAgents.new(params)
+
+    # friendly_attributes
+    assert_equal("04c62b91-b799-48b7-9cd5-2982db6df9c6", agent.id)
+    assert_equal(true, agent.admin_state_up)
+    assert_equal(true, agent.state) # alias
+    assert_equal("Open vSwitch agent", agent.agent_type)
+    assert_equal(true, agent.alive)
+    assert_equal("zone", agent.availability_zone)
+    assert_equal("neutron-openvswitch-agent", agent.binary)
+
+    # configurations is a complex Hash, so limit testing only one key.
+    assert_instance_of(Hash, agent.configurations)
+    assert_equal("172.16.78.191", agent.configurations['tunneling_ip'])
+
+    assert_equal("aaa bbb ccc", agent.description)
+    assert_equal("agenthost1", agent.host)
+    assert_equal(true, agent.resources_synced)
+    assert_equal("N/A", agent.topic)
+
+    assert_equal(Time.parse("2017-09-12 19:40:08"), agent.heartbeat_timestamp)
+    assert_equal(Time.parse("2017-09-12 19:35:38"), agent.created_at)
+    assert_equal(Time.parse("2017-09-12 19:35:38"), agent.started_at)
+  end
+end

data/test/yao/resources/test_restfully_accessible.rb

@@ -1,5 +1,5 @@
 class TestRestfullyAccesible < Test::Unit::TestCase
-  include RestfullAccessibleStub
+  include RestfullyAccessibleStub
   class Test
     class << self
       attr_accessor :client

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Uchio, KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -84,6 +84,7 @@ files:
 - lib/yao/resources.rb
 - lib/yao/resources/action.rb
 - lib/yao/resources/aggregates.rb
+- lib/yao/resources/amphora.rb
 - lib/yao/resources/base.rb
 - lib/yao/resources/compute_services.rb
 - lib/yao/resources/flavor.rb
@@ -101,6 +102,7 @@ files:
 - lib/yao/resources/meter.rb
 - lib/yao/resources/network.rb
 - lib/yao/resources/network_associationable.rb
+- lib/yao/resources/networking_agents.rb
 - lib/yao/resources/old_sample.rb
 - lib/yao/resources/port.rb
 - lib/yao/resources/port_associationable.rb
@@ -132,6 +134,7 @@ files:
 - test/support/restfully_accesible_stub.rb
 - test/support/test_yao_resource.rb
 - test/yao/resources/test_aggregates.rb
+- test/yao/resources/test_amphora.rb
 - test/yao/resources/test_base.rb
 - test/yao/resources/test_compute_services.rb
 - test/yao/resources/test_flavor.rb
@@ -147,6 +150,7 @@ files:
 - test/yao/resources/test_loadbalancer_pool_member.rb
 - test/yao/resources/test_meter.rb
 - test/yao/resources/test_network.rb
+- test/yao/resources/test_networking_agents.rb
 - test/yao/resources/test_old_sample.rb
 - test/yao/resources/test_port.rb
 - test/yao/resources/test_project.rb
@@ -206,6 +210,7 @@ test_files:
 - test/support/restfully_accesible_stub.rb
 - test/support/test_yao_resource.rb
 - test/yao/resources/test_aggregates.rb
+- test/yao/resources/test_amphora.rb
 - test/yao/resources/test_base.rb
 - test/yao/resources/test_compute_services.rb
 - test/yao/resources/test_flavor.rb
@@ -221,6 +226,7 @@ test_files:
 - test/yao/resources/test_loadbalancer_pool_member.rb
 - test/yao/resources/test_meter.rb
 - test/yao/resources/test_network.rb
+- test/yao/resources/test_networking_agents.rb
 - test/yao/resources/test_old_sample.rb
 - test/yao/resources/test_port.rb
 - test/yao/resources/test_project.rb