pec 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aadbb308e49e11ca2d2ced6b275a93fd70c4485f
-  data.tar.gz: 4f1d3be1d106fbcf7b4adb7b595f568468245b94
+  metadata.gz: 40647fc979435e780b1ed75ef3d5d5c69cef8430
+  data.tar.gz: bd561098ca4192c67f9ddb18f2b0f1dd0874ad7d
 SHA512:
-  metadata.gz: 38a7d1d3f93112fb776545753b0c52d465883fc5e3184ec5149202243f8c70d73e6c6542c7b72b58016b4f0efaea8cd01f2703453d40a356d0f78a76fe49215c
-  data.tar.gz: fe83c5437379bc16a8691cf596a0835c1070f5e7e84d9f4c83730e93eb48ea6862b8f315b22e7e629264a64b374c0e4eb812128d9062692f02e8b880f4b8394e
+  metadata.gz: caaf7f0b8c4b9f453734816999f23241ed1a319abc73c4c08b9cd545b08176f9fdc4c74aea9f400c07ec91244913ca13b26ef5046b10ee2a3cf2cd72aa5c6cdd
+  data.tar.gz: 2e70c4393bbb7cad5c0ab3b2485ddd78e4e59f7412ab9edeb9465ea51277be691387611937022528fb9f457b2189bb4102ef2873c23e22c7a9cb270c2f156d6a

data/lib/pec.rb

@@ -23,6 +23,7 @@ require "pec/compute/image"
 require "pec/compute/tenant"
 require "pec/compute/security_group"
 require "pec/network/port"
+require "pec/network/port_state"
 require "pec/network/subnet"
 require "pec/cli"
 

data/lib/pec/configure/ethernet.rb

@@ -3,16 +3,16 @@ module Pec
     class Ethernet
       attr_reader :name, :bootproto, :ip_address, :options
       def initialize(config)
-        @name = config[0];
-        @bootproto = config[1]["bootproto"];
+        @name       = config[0];
+        @bootproto  = config[1]["bootproto"];
         @ip_address = config[1]["ip_address"];
-        @options = config[1].select do |k,v|
+        @options    = config[1].select do |k,v|
           { k => v } if k != "bootproto" && k != "ip_address"
         end
       end
 
       def find_port(ports)
-        ports.find { |p| p.name == @name }
+        ports.find { |p| p.device_name == @name }
       end
 
       class << self

data/lib/pec/director/helper.rb

@@ -14,7 +14,7 @@ module Pec
             port_subnet = Pec::Network::Subnet.fetch(ip.network.to_s)
             raise(Pec::Errors::Subnet, "subnet:#{ip.network.to_s} is not fond!") unless port_subnet
 
-            port = Pec::Network::Port.new.assign(ether.name, ip, port_subnet, get_security_group_id(host.security_group))
+            port = Pec::Network::Port.assign(ether.name, ip, port_subnet, get_security_group_id(host.security_group))
             raise(Pec::Errors::Port, "ip addess:#{ip.to_addr} can't create port!") unless port
 
             puts "#{host.name}: assingn ip #{port.ip_address}".green

data/lib/pec/network/port.rb

@@ -3,96 +3,73 @@ module Pec
   class Network
     class Port
       extend Query
-      attr_reader :name, :subnet
-      @@use_ip_list = []
-
-      def assign(name, ip, subnet, security_group_ids)
-        @name = name
-        @subnet = subnet
-
-        # dhcp ip recycle
-        if request_any_address?(ip)
-          @port = fetch_free_port
-          ip = IP.new("#{@port["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") unless @port.nil?
+      class << self
+        @@use_ip_list = []
+
+        def assign(name, ip, subnet, security_group_ids)
+          ip = get_free_port_ip(ip, subnet) if request_any_address?(ip, subnet)
+          port_state = Pec::Network::PortState.new(name, fetch_by_ip(ip.to_addr))
+
+          assign_port = case
+            when port_state.exists? &&  !port_state.used?
+              recreate(ip, subnet, security_group_ids)
+            when !port_state.exists?
+              create(ip, subnet, security_group_ids)
+            when port_state.used?
+              raise(Pec::Errors::Port, "ip:#{ip.to_addr} is used!")
+          end
+          Pec::Network::PortState.new(name, assign_port)
         end
-        case
-        when exists? && !used?
-          recreate(ip, subnet, security_group_ids)
-        when !exists?
-          create(ip, subnet, security_group_ids)
-        when used?
-          raise(Pec::Errors::Port, "ip:#{ip.to_addr} is used!")
-        end
-        self
-      end
 
-      def create(ip, subnet, security_group_ids)
-        options = { security_groups: security_group_ids }
-        options.merge!({ fixed_ips: [{ subnet_id: subnet["id"], ip_address: ip.to_addr}]}) if ip.to_s != subnet["cidr"]
-        response = Pec::Resource.get.create_port(subnet["network_id"], options)
-        if response
-          @port = response.data[:body]["port"] 
-          @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
-          response.data[:body]["port"]["id"]
+        def get_free_port_ip(ip, subnet)
+          port = fetch_free_port(subnet)
+          port ? IP.new("#{port["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") : ip
         end
-      end
 
-      def delete(ip)
-        target_port = fetch_by_ip(ip.to_addr)
-        response = Pec::Resource.get.delete_port(target_port["id"]) if target_port
-      end
+        def create(ip, subnet, security_group_ids)
+          options = set_security_group(security_group_ids)
+          options = set_fixed_ip(options, subnet, ip)
+          response = Pec::Resource.get.create_port(subnet["network_id"], options)
 
-      def recreate(ip, subnet, security_group_ids)
-        create(ip, subnet, security_group_ids) if delete(ip)
-      end
+          raise(Pec::Errors::Port, "ip:#{ip.to_addr} is not created!") unless response
 
-      def request_any_address?(ip)
-        ip.to_s == subnet["cidr"]
-      end
-
-      def list
-        Pec::Resource.get.port_list
-      end
-
-      def fetch_by_ip(ip_addr)
-        list.find {|p| p["fixed_ips"][0]["ip_address"] == ip_addr }
-      end
-
-      def fetch_free_port
-        list.find do |p|
-          p["fixed_ips"][0]["subnet_id"] == @subnet["id"] &&
-          p["device_owner"].empty? &&
-          p["admin_state_up"] &&
-          !@@use_ip_list.include?(p["fixed_ips"][0]["ip_address"])
+          @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
+          response.data[:body]["port"]
         end
-      end
 
-      def exists?
-        !@port.nil?
-      end
+        def set_security_group(security_group_ids)
+          { security_groups: security_group_ids }
+        end
 
-      def used?
-        @port && !@port["device_owner"].empty?
-      end
+        def set_fixed_ip(options, subnet, ip)
+          ip.to_s != subnet["cidr"] ? options.merge({ fixed_ips: [{ subnet_id: subnet["id"], ip_address: ip.to_addr}]}) : options
+        end
 
-      def id
-        @port["id"]
-      end
+        def delete(ip)
+          target_port = fetch_by_ip(ip.to_addr)
+          response = Pec::Resource.get.delete_port(target_port["id"]) if target_port
+        end
 
-      def mac_address
-        @port["mac_address"]
-      end
+        def recreate(ip, subnet, security_group_ids)
+          create(ip, subnet, security_group_ids) if delete(ip)
+        end
 
-      def ip_address
-        @port["fixed_ips"][0]["ip_address"]
-      end
+        def request_any_address?(ip, subnet)
+          ip.to_s == subnet["cidr"]
+        end
 
-      def network_id
-        @port["network_id"]
-      end
+        def fetch_by_ip(ip_addr)
+          list.find {|p| p["fixed_ips"][0]["ip_address"] == ip_addr }
+        end
 
-      def netmask
-        IP.new(@port["fixed_ips"][0]["ip_address"]).netmask.to_s
+        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"] &&
+            !@@use_ip_list.include?(p["fixed_ips"][0]["ip_address"])
+          end
+        end
       end
     end
   end

data/lib/pec/network/port_state.rb

@@ -0,0 +1,40 @@
+require 'json'
+module Pec
+  class Network
+    class PortState
+      attr_reader :device_name
+      def initialize(device_name, port)
+        @device_name = device_name
+        @port = port
+      end
+
+      def exists?
+        !@port.nil?
+      end
+
+      def used?
+        @port && !@port["device_owner"].empty?
+      end
+
+      def id
+        @port["id"]
+      end
+
+      def mac_address
+        @port["mac_address"]
+      end
+
+      def ip_address
+        @port["fixed_ips"][0]["ip_address"]
+      end
+
+      def network_id
+        @port["network_id"]
+      end
+
+      def netmask
+        IP.new(@port["fixed_ips"][0]["ip_address"]).netmask.to_s
+      end
+    end
+  end
+end

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - kazuhiko yamashita
@@ -162,6 +162,7 @@ files:
 - lib/pec/errors.rb
 - lib/pec/init.rb
 - lib/pec/network/port.rb
+- lib/pec/network/port_state.rb
 - lib/pec/network/subnet.rb
 - lib/pec/query.rb
 - lib/pec/resource.rb