pec 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35cad45133a8df40934711c27364efb26b8508a1
-  data.tar.gz: 55cef3480870581c1b2eddc60fdfa805ce9216e5
+  metadata.gz: d01486180af33f819f339eb46e351d320590903c
+  data.tar.gz: f61c04dfb32b6e8c49095271c465026a5ffef0df
 SHA512:
-  metadata.gz: de7ec22cd43e85a97ecf264875c5c021bd2c99529ad4c455ab70a72f9d967c2775817319b5e4b861fa2dacab2ecb1a0ab5f725376bac967e378cbd9f031312f8
-  data.tar.gz: 7e34e2de84215bbf238a70eabeba9a23c2fd8363afbf21f423fc75424a2d4a3172954c5298bfd1a59a2e822697ffa510db90879475f31cf2be3bc0192788d418
+  metadata.gz: cd9c54bfc3e426c7db4134b07026a52ddd70997b3a6ef7789e3c08c139017360222f78ad90968239ba5006c1185f26c149a02334f2682af5486f4496feefd521
+  data.tar.gz: dc68e0627397e6a4624139d4377f7b6b8506f343aa79d8a829c0e9c6a585375a568b0ba7ce2bf2012cd33d51074cb7545a798285715c4ea01f7a649869c015c7

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-
+ENV['CODECLIMATE_REPO_TOKEN'] = "c969d1896316cbd26ab70d3b7fef4f4e168df83b849fa7f16a1885569c86f29c"
+ENV['PEC_TEST'] = "test"
 RSpec::Core::RakeTask.new("spec")
 task :default => :spec

data/lib/pec.rb

@@ -7,6 +7,7 @@ require "pec/errors"
 require "pec/init"
 require "pec/resource"
 require "pec/resource/openstack"
+require "pec/resource/mock"
 require "pec/director"
 require "pec/director/helper"
 require "pec/director/make_director"

data/lib/pec/compute/server.rb

@@ -4,12 +4,9 @@ module Pec
       extend Query
       class << self
         def create(name, image_ref, flavor_ref, options)
-
           response = Pec::Resource.get.create_server(name, image_ref, flavor_ref, options)
-
-          if response[:status] == 202
-            puts "success create for server_name:#{name}".blue
-          end
+          raise(Pec::Errors::Host, "server_name:#{name} response err status:#{response[:status]}") unless response[:status] == 202
+          puts "success create for server_name:#{name.to_s}".blue
 
           response.data[:body]["server"]["id"]
         end
@@ -23,9 +20,9 @@ module Pec
           raise(Pec::Errors::Host, "server_name:#{server_name} is not fond!") unless server
           response = Pec::Resource.get.delete_server(server["id"]) if server
 
-          if response && response[:status] == 204
-            puts "server_name:#{server_name} is deleted!".green
-          end
+          raise(Pec::Errors::Host, "server_name:#{name} response err status:#{response[:status]}") unless response[:status] == 204
+          puts "server_name:#{server_name} is deleted!".green
+          true
         end
       end
     end

data/lib/pec/configure.rb

@@ -4,7 +4,13 @@ module Pec
     include Enumerable
 
     def initialize(file_name)
-      YAML.load_file(file_name).to_hash.each do |config|
+      if file_name.is_a?(Hash)
+        hash = file_name
+      else
+        hash = YAML.load_file(file_name).to_hash
+      end
+
+      hash.each do |config|
         host = Pec::Configure::Host.load(config)
         @configure ||= []
         @configure << host if host

data/lib/pec/configure/user_data.rb

@@ -13,7 +13,7 @@ module Pec
 
         def get_template(config)
           config.templates.inject({}) do |merge_template, template|
-            template.concat('.yaml') unless template.match(/.*\.yaml/)
+            template.to_s.concat('.yaml') unless template.to_s.match(/.*\.yaml/)
             raise(Pec::Errors::UserData, "template:#{template} is not fond!") unless FileTest.exist?("user_datas/#{template}")
             merge_template.merge!(YAML.load_file("user_datas/#{template}").to_hash)
           end if config.templates

data/lib/pec/director.rb

@@ -5,7 +5,6 @@ class Director
       def execute(action, host_name, options=nil)
         config = Pec::Configure.new("Pec.yaml")
         director = assign_director(action, options)
-
         config.filter_by_host(host_name).each do |host|
           begin
             director.execute!(host) if director.do_it?(host)

data/lib/pec/director/helper.rb

@@ -5,13 +5,9 @@ module Pec
 
         def ports_assign(host)
           host.networks.map do |ether|
-            begin
-              ip = IP.new(ether.ip_address)
-            rescue ArgumentError => e
-              raise(Pec::Errors::Port, "ip:#{ether.ip_address} #{e}")
-            end
+            ip = IP.new(ether.ip_address)
 
-            port_subnet = Pec::Network::Subnet.fetch(ip.network.to_s)
+            port_subnet = Pec::Network::Subnet.fetch_by_cidr(ip.network.to_s)
             raise(Pec::Errors::Subnet, "subnet:#{ip.network.to_s} is not fond!") unless port_subnet
 
             port = Pec::Network::Port.assign(ether.name, ip, port_subnet, get_security_group_id(host.security_group))
@@ -20,6 +16,8 @@ module Pec
             puts "#{host.name}: assingn ip #{port.ip_address}".green
             port
           end if host.networks
+          rescue ArgumentError => e
+            raise(Pec::Errors::Port, "ip:#{ether.ip_address} #{e}")
         end
 
         def set_nics(options, ports)

data/lib/pec/network/port.rb

@@ -25,11 +25,20 @@ module Pec
           options  = set_security_group(security_group_ids)
           options  = set_fixed_ip(options, subnet, ip)
           response = Pec::Resource.get.create_port(subnet["network_id"], options)
-
-          raise(Pec::Errors::Port, "ip:#{ip.to_addr} is not created!") unless response
+          raise(Pec::Errors::Port, "ip:#{ip.to_addr} is not created!") unless response[:status] == 201
           append_assigned_ip(response)
+          port_from_response(response)
+        end
 
-          response.data[:body]["port"]
+        def delete(ip)
+          target_port = fetch_by_ip(ip.to_addr)
+          response = Pec::Resource.get.delete_port(target_port["id"]) if target_port
+          raise(Pec::Errors::Host, "ip:#{ip.to_addr} response err status:#{response[:status]}") unless response[:status] == 204
+          true
+        end
+
+        def recreate(ip, subnet, security_group_ids)
+          create(ip, subnet, security_group_ids) if delete(ip)
         end
 
         def set_security_group(security_group_ids)
@@ -41,42 +50,53 @@ module Pec
         end
 
         def append_assigned_ip(response)
-          @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
+          @@use_ip_list << ip_from_port(port_from_response(response))
         end
 
         def assigned_ip?(port)
-          @@use_ip_list.include?(port["fixed_ips"][0]["ip_address"])
+          @@use_ip_list.include?(ip_from_port(port))
         end
 
         def get_free_port_ip(ip, subnet)
-          port = fetch_free_port(subnet)
-          port ? IP.new("#{port["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") : ip
+          port = get_free_port(subnet)
+          port ? IP.new("#{ip_from_port(port)}/#{ip.pfxlen}") : ip
         end
 
-        def delete(ip)
-          target_port = fetch_by_ip(ip.to_addr)
-          response = Pec::Resource.get.delete_port(target_port["id"]) if target_port
+        def fetch_by_ip(ip_addr)
+          list.find {|p| ip_from_port(p) == ip_addr }
         end
 
-        def recreate(ip, subnet, security_group_ids)
-          create(ip, subnet, security_group_ids) if delete(ip)
+        def port_from_response(response)
+          response.data[:body]["port"]
+        end
+
+        def ip_from_port(port)
+          port["fixed_ips"][0]["ip_address"] 
+        end
+
+        def get_free_port(subnet)
+          list.find do |p|
+            same_subnet?(p, subnet) &&
+            unused?(p) &&
+            admin_state_up?(p) &&
+            !assigned_ip?(p)
+          end
         end
 
         def request_any_address?(ip, subnet)
           ip.to_s == subnet["cidr"]
         end
 
-        def fetch_by_ip(ip_addr)
-          list.find {|p| p["fixed_ips"][0]["ip_address"] == ip_addr }
+        def same_subnet?(port, subnet)
+          port["fixed_ips"][0]["subnet_id"] == subnet["id"]
         end
 
-        def fetch_free_port(subnet)
-          list.find do |p|
-            p["fixed_ips"][0]["subnet_id"] == subnet["id"] &&
-            p["device_owner"].empty? &&
-            p["admin_state_up"] &&
-            !assigned_ip?
-          end
+        def unused?(port)
+          port["device_owner"].empty?
+        end
+
+        def admin_state_up?(port)
+          port["admin_state_up"]
         end
       end
     end

data/lib/pec/network/subnet.rb

@@ -3,7 +3,7 @@ module Pec
     class Subnet
       extend Query
       class << self
-        def fetch(cidr)
+        def fetch_by_cidr(cidr)
           subnet = list.find {|p| p["cidr"] == cidr }
           raise(Pec::Errors::Subnet, "cidr:#{cidr} is not fond!") unless subnet
           subnet

data/lib/pec/resource.rb

@@ -9,6 +9,8 @@ module Pec
         raise(Pec::Errors::Resource, "Please be tenant is always set") unless @@_tenant
         unless ENV['PEC_TEST']
           @@_resource[@@_tenant] ||= Pec::Resource::OpenStack.new(@@_tenant)
+        else
+          @@_resource[@@_tenant] ||= Pec::Resource::Mock.new(@@_tenant)
         end
       end
 

data/lib/pec/resource/mock.rb

@@ -0,0 +1,172 @@
+module Pec
+  class Resource
+    class Mock
+      def initialize(tenant)
+        tenant_hash = { "openstack_tenant" => tenant }
+      end
+
+      def port_list
+        1.upto(10).map do |c|
+          {
+            "id" => c,
+            "fixed_ips" => [
+              { "subnet_id" => c,
+                "ip_address" => "#{c}." * 3 + "#{c}"
+              }
+            ],
+            "network_id" => c,
+            "device_owner" => c % 2 == 0 ? c.to_s : "",
+            "admin_state_up" => c % 2 == 0 ? "True" : "False"
+          }
+       end
+      end
+
+      def subnet_list
+        1.upto(10).map do |c|
+          {
+            "id" => c,
+            "cidr" => "#{c}." * 3 + "0/24",
+            "network_id" => c
+          }
+        end
+      end
+
+      def server_list
+        10.upto(20).map do |c|
+          {
+            "id" => c,
+            "name" => c,
+            "status" => c %2 == 0 ? "Active" : "SHUTOFF"
+          }
+        end
+      end
+
+      def security_group_list
+        1.upto(10).map do |c|
+          {
+            "id" => c,
+            "name" => c
+          }
+        end
+      end
+
+      def image_list
+        ref_list
+      end
+
+      def flavor_list
+        ref_list
+      end
+
+      def ref_list
+        1.upto(10).map do |c|
+          {
+            "id" => c,
+            "name" => c,
+            "links" => [
+              "href" => c
+            ]
+          }
+        end
+
+      end
+
+      def tenant_list
+        1.upto(10).map do |c|
+          {
+            "id" => c,
+            "name" => c
+          }
+        end
+      end
+
+      def create_server(name, image_ref, flavor_ref, options)
+        object = Object.new
+        object.set_value(name, 202)
+        object
+      end
+
+      def delete_server(server_id)
+        object = Object.new
+        object.set_value(server_id, 204)
+        object
+      end
+
+      def get_server_details(server_id)
+        if server_id.to_i % 2 == 0
+          {
+            "status" => "active",
+            "OS-EXT-SRV-ATTR:host" => "#{server_id}.compute.node",
+            "flavor" => {
+              "id" => server_id
+            },
+            "tenant_id" => server_id,
+            "addresses" => {
+              "test_net" => [
+                "addr" => server_id
+              ]
+            }
+          }
+        else
+          {
+            "status" => "uncreated",
+            "OS-EXT-SRV-ATTR:host" => "#{server_id}.compute.node",
+            "flavor" => {
+              "id" => server_id
+            },
+            "tenant_id" => server_id,
+            "addresses" => {
+              "test_net" => {
+                "addr" => server_id
+              }
+            }
+          }
+        end
+      end
+      def create_port(network_id, options)
+        object = Object.new
+        object.set_value(network_id, 201)
+        object
+      end
+
+      def delete_port(port_id)
+        object = Object.new
+        object.set_value(port_id, 204)
+        object
+      end
+    end
+  end
+end
+class Object
+  attr_reader :status
+  def set_value(value, status)
+    @value = value
+    @status = @value.to_i % 2 == 0 ? 999 : status
+  end
+
+  def [](key)
+    @status
+  end
+
+  def data
+    {
+      :body => {
+        "port" => {
+          "id" => @value,
+          "fixed_ips" => [
+            { 
+              "subnet_id" => @value,
+              "ip_address" => "#{@value}." * 3 + "#{@value}"
+            }
+          ],
+          "network_id" => @value,
+          "device_owner" => @value.to_i % 2 == 0 ? @value : "",
+          "admin_state_up" => @value.to_i % 2 == 0 ? "True" : "False"
+        },
+        "server" => {
+          "id" => @value
+        }
+      }
+    }
+  end
+end

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -166,6 +166,7 @@ files:
 - lib/pec/network/subnet.rb
 - lib/pec/query.rb
 - lib/pec/resource.rb
+- lib/pec/resource/mock.rb
 - lib/pec/resource/openstack.rb
 - lib/pec/version.rb
 - pec.gemspec