pec 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff9692ce800f020d84648166b9b0efd0dd706850
-  data.tar.gz: 1bc2f21a9975f5b961e6a7546a1bfc39047b79aa
+  metadata.gz: 35cad45133a8df40934711c27364efb26b8508a1
+  data.tar.gz: 55cef3480870581c1b2eddc60fdfa805ce9216e5
 SHA512:
-  metadata.gz: 516b5d1eb608325daa9896903b29998c8475b69455336bc5872ca67877774a9a7f4b2a2e47c1a6b64535014e55e0b066affbdc703b52840f75a01ded22aeff57
-  data.tar.gz: d279871aacbbde8bdf9f7df4994531c755abca182486e3c8fd55d3cbadfd1e34c5eab43b75514328e0ad06d41b665cf7e5f294fea2ff0445d0787c98b7a2d59f
+  metadata.gz: de7ec22cd43e85a97ecf264875c5c021bd2c99529ad4c455ab70a72f9d967c2775817319b5e4b861fa2dacab2ecb1a0ab5f725376bac967e378cbd9f031312f8
+  data.tar.gz: 7e34e2de84215bbf238a70eabeba9a23c2fd8363afbf21f423fc75424a2d4a3172954c5298bfd1a59a2e822697ffa510db90879475f31cf2be3bc0192788d418

data/lib/pec/configure/ethernet.rb

@@ -6,13 +6,56 @@ module Pec
         @name       = config[0];
         @bootproto  = config[1]["bootproto"];
         @ip_address = config[1]["ip_address"];
-        @options    = config[1].select do |k,v|
-          { k => v } if k != "bootproto" && k != "ip_address"
+        @options    = config[1].reject do |k,v|
+          { k => v } if k == "bootproto" || k == "ip_address"
         end
       end
 
-      def find_port(ports)
-        ports.find { |p| p.device_name == @name }
+      def get_port_content(ports)
+        base = {
+          "bootproto" => @bootproto,
+          "name"      => config_name,
+          "device"    => device_name,
+          "type"      => type,
+          "onboot"    => onboot,
+          "hwaddr"    => mac_address(ports),
+        }
+        base.merge!({ "netmask" => netmask(ports), "ipaddr" => port_ip_address(ports) }) if static?
+        base.merge!(@options) if @options
+        base.map {|k,v| "#{k.upcase}=#{v}"}.join("\n")
+      end
+
+
+      def config_name
+        @options["name"] || @name
+      end
+
+      def device_name
+        @options["device"] || @name
+      end
+
+      def type
+        @options["type"] || 'Ethernet'
+      end
+
+      def onboot
+        @options["onboot"] || 'yes'
+      end
+
+      def mac_address(ports)
+         ports.find { |p| p.device_name == @name }.mac_address
+      end
+
+      def netmask(ports)
+        ports.find { |p| p.device_name == @name }.netmask
+      end
+
+      def port_ip_address(ports)
+        ports.find { |p| p.device_name == @name }.ip_address
+      end
+
+      def static?
+        @bootproto == "static"
       end
 
       class << self

data/lib/pec/configure/user_data.rb

@@ -21,23 +21,9 @@ module Pec
 
         def make_port_content(config, ports)
           config.networks.map do |ether|
-            ifcfg_content = {}
-            ifcfg_content["bootproto"] = ether.bootproto
-            ifcfg_content["name"]      = ether.options["name"]   || ether.name
-            ifcfg_content["device"]    = ether.options["device"] || ether.name
-            ifcfg_content["type"]      = ether.options['type']   ||'Ethernet'
-            ifcfg_content["onboot"]    = ether.options['onboot'] || 'yes'
-            ifcfg_content["hwaddr"]    = ether.find_port(ports).mac_address
-            if ether.bootproto == "static"
-              ifcfg_content["netmask"] = ether.find_port(ports).netmask
-              ifcfg_content["ipaddr"]  = ether.find_port(ports).ip_address
-            end
-
-            ifcfg_content.merge!(ether.options)
-
             path = ether.options['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{ether.name}"
             {
-              'content' => ifcfg_content.map {|k,v| "#{k.upcase}=#{v}"}.join("\n"),
+              'content' => ether.get_port_content(ports),
               'owner' => "root:root",
               'path' => path,
               'permissions' => "0644"

data/lib/pec/network/port.rb

@@ -27,8 +27,8 @@ module Pec
           response = Pec::Resource.get.create_port(subnet["network_id"], options)
 
           raise(Pec::Errors::Port, "ip:#{ip.to_addr} is not created!") unless response
+          append_assigned_ip(response)
 
-          @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
           response.data[:body]["port"]
         end
 
@@ -40,6 +40,14 @@ module Pec
           ip.to_s != subnet["cidr"] ? options.merge({ fixed_ips: [{ subnet_id: subnet["id"], ip_address: ip.to_addr}]}) : options
         end
 
+        def append_assigned_ip(response)
+          @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
+        end
+
+        def assigned_ip?(port)
+          @@use_ip_list.include?(port["fixed_ips"][0]["ip_address"])
+        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
@@ -67,7 +75,7 @@ module Pec
             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"])
+            !assigned_ip?
           end
         end
       end

data/lib/pec/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - kazuhiko yamashita