pec 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7355209a3c35e40ac68d514cae1e0ed75e8102
-  data.tar.gz: ea45ced7c65397076d2c7496eb5efe44ffa6d41a
+  metadata.gz: aee729f5850370d4c8952b4d3cd740451734d435
+  data.tar.gz: 03d566fbd321cdd48398e557e544eb7a99d03f3e
 SHA512:
-  metadata.gz: 3f40e9678fbd05ffeac16fac0ca9eb1832185a38526a188149a473dee6d8e397d1250b1c081a30b687262fb02e7ebab83b02c53dcca3d9b03f7cb4f15daffdb8
-  data.tar.gz: 57feae3668f00d475f1b1be8871294caa4fb7ac72ace25a78a9af76e57220cf1dd70dcf58e4aa7e5b5392e20db6c782cf49fd11459c664c44046697d56accc1d
+  metadata.gz: 92fd5ce89d06b31c5e75df19f6491650635ac63c077956f2cff1833c20bfc1565ff1be034b1213721bd943c28905fc90379f961f5b22691858fbd63421ebe69a
+  data.tar.gz: 956df3f42e44c7fa0e27f610728da2a7182ed5f3c91e5f87b62ca531ec06159338871325f2d35c9d4fa4c906183e931402a508af98e6df2070967c1eed450525

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-- 2.0.0
 - 2.1.6
 - 2.2.2
 addons:

data/lib/pec.rb

@@ -5,9 +5,9 @@ require "pec/version"
 require "pec/logger"
 require "pec/configure"
 require "pec/director"
-require "pec/builder/server"
-require "pec/builder/port"
-require "pec/builder/user_data"
+require "pec/handler"
+require "pec/sample"
+require "pec/init"
 require "pec/cli"
 
 module Pec
@@ -41,6 +41,19 @@ module Pec
   end
 
   def self.configure
+    load_config unless @_configure
     @_configure
   end
 end
+
+class ::Hash
+
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+    self.merge(second.to_h, &merger)
+  end
+
+  def deep_merge!(second)
+    self.merge!(deep_merge(second))
+  end
+end

data/lib/pec/configure.rb

@@ -9,8 +9,11 @@ module Pec
       @_config[0]
     end
 
+    def keys
+      @_config[1].keys
+    end
+
     def method_missing(method, *args)
-      nil unless @_config[1][method.to_s]
       @_config[1][method.to_s]
     end
 

data/lib/pec/director.rb

@@ -1,26 +1,22 @@
 module Pec
   class Director
     def self.make(host_name)
-      Pec.load_config
       Pec.configure.each do |host|
         next if host_name && host.name != host_name
         Pec::Logger.info "make start #{host.name}"
-        
         Pec.compute.set_tenant(host.tenant)
         Pec.neutron.set_tenant_patch(host.tenant)
-       
-        port_builder = Pec::Builder::Port.new
-        server_builder = Pec::Builder::Server.new
-        user_data_builder = Pec::Builder::UserData.new
-
-        attribute = {}
-        attribute.merge!(server_builder.build(host))
-        attribute.merge!(port_builder.build(host))
 
-        if user_data = user_data_builder.build(host, port_builder.user_data)
-          attribute.merge!(user_data)
+        attribute = { name: host.name}
+        host.keys.each do |k|
+          Pec::Handler.constants.each do |c|
+            if Object.const_get("Pec::Handler::#{c}").kind == k
+              attribute.deep_merge!(Object.const_get("Pec::Handler::#{c}").build(host))
+            end
+          end
         end
         
+        attribute[:user_data] = "#cloud-config\n" + attribute[:user_data].to_yaml if attribute[:user_data]
         Pec::Logger.info "create success! #{host.name}" if Pec.compute.servers.create(attribute)
       end
 
@@ -31,7 +27,6 @@ module Pec
     end
 
     def self.destroy(host_name, options)
-      Pec.load_config
       Pec.configure.each do |host|
         next if host_name && host.name != host_name
         Pec.compute.set_tenant(host.tenant)
@@ -46,6 +41,7 @@ module Pec
           Pec::Logger.info "#{host.name} is deleted!" if Pec.compute.servers.destroy(server.id)
         end
       end
+
       rescue Excon::Errors::Error => e
         excon_err_message(e)
       rescue => e
@@ -53,11 +49,9 @@ module Pec
     end
 
     def self.status(host_name)
-      Pec.load_config
       Pec.configure.each do |host|
         next if host_name && host.name != host_name
-        server = Pec.compute.servers.find {|s|s.name == host.name}
-        if server
+        if server = Pec.compute.servers.find {|s|s.name == host.name}
           puts sprintf(" %-35s %-10s %-10s %-10s %-10s %-35s %-48s",
             host.name,
             server.state,
@@ -65,13 +59,12 @@ module Pec
             Pec.compute.flavors.get(server.flavor['id']).name,
             server.availability_zone,
             server.os_ext_srv_attr_host,
-            server.addresses.map do |net, ethers|                                                                                                    
-              ethers.map do |ether|                                                                                                           
+            server.addresses.map do |ethers|                                                                                                    
+              ethers[1].map do |ether|                                                                                                           
                 ether["addr"]                                                                                                                 
               end                                                                                                                             
             end.flatten.join(",")
           )
-
         else
           puts sprintf(" %-35s %-10s",
             host.name,

data/lib/pec/handler.rb

@@ -0,0 +1,11 @@
+module Pec
+  module Handler
+    autoload :Base,             "pec/handler/base"
+    autoload :AvailabilityZone, "pec/handler/availability_zone"
+    autoload :Image,            "pec/handler/image"
+    autoload :Flavor,           "pec/handler/flavor"
+    autoload :Networks,         "pec/handler/networks"
+    autoload :UserData,         "pec/handler/user_data"
+    autoload :Templates,        "pec/handler/templates"
+  end
+end

data/lib/pec/handler/availability_zone.rb

@@ -0,0 +1,12 @@
+module Pec::Handler
+  class AvailabilityZone < Base 
+    self.kind = 'availability_zone'
+
+    def self.build(host)
+      Pec::Logger.notice "availability_zone is #{host.availability_zone}"
+      {
+        availability_zone: host.availability_zone
+      }
+    end
+  end
+end

data/lib/pec/handler/base.rb

@@ -0,0 +1,16 @@
+module Pec::Handler
+  class Base
+    class << self
+      attr_accessor :kind
+
+      %w(image flavor).each do |name|
+        define_method("fetch_#{name}", -> (host) {
+          unless resource = Pec.compute.send("#{name}s").find {|val|val.name == host.send(name)}
+            raise "not fond #{name} #{host.send(name)}"
+          end
+          resource
+        })
+      end
+    end
+  end
+end

data/lib/pec/handler/flavor.rb

@@ -0,0 +1,12 @@
+module Pec::Handler
+  class Flavor < Base 
+    self.kind = 'image'
+
+    def self.build(host)
+      Pec::Logger.notice "flavor is #{host.flavor}"
+      {
+        flavor_ref: fetch_flavor(host).id,
+      }
+    end
+  end
+end

data/lib/pec/handler/image.rb

@@ -0,0 +1,12 @@
+module Pec::Handler
+  class Image < Base 
+    self.kind = 'image'
+
+    def self.build(host)
+      Pec::Logger.notice "image is #{host.image}"
+      {
+        image_ref:  fetch_image(host).id
+      }
+    end
+  end
+end

data/lib/pec/handler/networks.rb

@@ -0,0 +1,114 @@
+module Pec::Handler
+  class Networks < Base 
+    self.kind = 'networks'
+    autoload :OptionBase,          "pec/handler/networks/option_base"
+    autoload :IpAddress,           "pec/handler/networks/ip_address"
+    autoload :AllowedAddressPairs, "pec/handler/networks/allowed_address_pairs"
+    
+    class << self
+      NAME = 0
+      CONFIG = 1
+
+      def build(host)
+        ports = []
+        user_data = []
+
+        host.networks.each do |network|
+          validate(network)
+          Pec::Logger.notice "port create start : #{network[NAME]}"
+          port = create_port(host, network)
+          Pec::Logger.notice "assgin ip : #{port.fixed_ips.first["ip_address"]}"
+          ports << port
+          user_data << gen_user_data(network, port)
+        end
+        {
+          nics: ports.map {|port| { port_id: port.id }},
+          user_data: {
+            'write_files' => user_data
+          }
+        }
+      end
+
+      def validate(network)
+        %w(
+          bootproto
+          ip_address
+        ).each do |k|
+          raise "network key #{k} is require" unless network[CONFIG][k]
+        end
+      end
+
+      def create_port(host, network)
+        attribute = gen_port_attribute(host, network)
+        Pec.neutron.ports.create(attribute)
+      end
+     
+      def gen_port_attribute(host, network)
+        ip = IP.new(network[CONFIG]['ip_address'])
+        subnet = Pec.neutron.subnets.find {|s|s.cidr == ip.network.to_s}
+        attribute = {
+          name: network[NAME],
+          network_id: subnet.network_id
+        }
+        
+        attribute.merge!(
+          security_group(host)
+        ) if host.security_group
+
+        network[CONFIG].keys.each do |k|
+          Pec::Handler::Networks.constants.each do |c|
+            if Object.const_get("Pec::Handler::Networks::#{c}").kind == k &&
+                ops = Object.const_get("Pec::Handler::Networks::#{c}").build(network)
+              attribute.deep_merge!(ops)
+            end
+          end
+        end
+
+        attribute
+      end
+     
+      def gen_user_data(network, port)
+        path = network[CONFIG]['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{port.name}"
+        {
+          'content' => ifcfg_config(network, port),
+          'owner' => "root:root",
+          'path' => path,
+          'permissions' => "0644"
+        }
+      end
+      
+      def ifcfg_config(network, port)
+        base = {
+          "name"      => port.name,
+          "device"    => port.name,
+          "type"      => 'Ethernet',
+          "onboot"    => 'yes',
+          "hwaddr"    => port.mac_address
+        }
+        base.merge!(
+          {
+            "netmask" => IP.new(network[CONFIG]['ip_address']).netmask.to_s,
+            "ipaddr"  => port.fixed_ips.first['ip_address']
+          }
+        ) if network[CONFIG]['bootproto'] == "static"
+
+        # delete option column
+        Pec::Handler::Networks.constants.each do |c|
+          network[CONFIG].delete(Object.const_get("Pec::Handler::Networks::#{c}").kind)
+        end 
+
+        base.merge!(
+          network[CONFIG]
+        )
+        base.map {|k,v| "#{k.upcase}=#{v}"}.join("\n")
+      end
+
+      def security_group(host)
+        ids = host.security_group.map do |name|
+          Pec.neutron.security_groups.find {|sg| sg.name == name}.id
+        end
+        { security_groups: ids }
+      end
+    end
+  end
+end

data/lib/pec/handler/networks/allowed_address_pairs.rb

@@ -0,0 +1,17 @@
+module Pec::Handler
+  class Networks
+    class AllowedAddressPairs< OptionBase
+      self.kind = 'allowed_address_pairs'
+      class << self
+        def build(network)
+          if network[1]['allowed_address_pairs']
+            pairs = network[1]['allowed_address_pairs'].map do |pair|
+              { ip_address: pair['ip_address'] }
+            end
+            { allowed_address_pairs: pairs }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pec/handler/networks/ip_address.rb

@@ -0,0 +1,21 @@
+module Pec::Handler
+  class Networks
+    class IpAddress < OptionBase
+      self.kind = 'ip_address'
+      class << self
+        def build(network)
+          ip = IP.new(network[1]['ip_address'])
+          subnet = Pec.neutron.subnets.find {|s|s.cidr == ip.network.to_s}
+
+          if ip.to_s != subnet.cidr
+            { 
+              fixed_ips: [
+                { subnet_id: subnet.id, ip_address: ip.to_addr}
+              ]
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pec/handler/networks/option_base.rb

@@ -0,0 +1,9 @@
+module Pec::Handler
+  class Networks
+    class OptionBase
+      class << self
+        attr_accessor :kind
+      end
+    end
+  end
+end

data/lib/pec/handler/templates.rb

@@ -0,0 +1,20 @@
+module Pec::Handler
+  class Templates < Base
+    self.kind = 'templates'
+    class << self
+      def build(host) 
+        { user_data: load_template(host) }
+      end
+
+      def load_template(host)
+        host.templates.inject({}) do |merge_template, template|
+          template.to_s.concat('.yaml') unless template.to_s.match(/.*\.yaml/)
+          Pec::Logger.notice "load template #{template}"
+
+          raise "#{template} not fond!" unless FileTest.exist?("user_data/#{template}")
+          merge_template.deep_merge!(YAML.load_file("user_data/#{template}").to_hash)
+        end if host.templates
+      end 
+    end
+  end
+end

data/lib/pec/handler/user_data.rb

@@ -0,0 +1,13 @@
+module Pec::Handler
+  class UserData < Base
+    self.kind = 'user_data'
+    class << self
+      def build(host) 
+        user_data = host.user_data || {}
+        user_data['fqdn'] = host.name if host.user_data && !host.user_data['fqdn'] 
+        { user_data: user_data }
+      end
+    end
+  end
+end
+

data/lib/pec/sample.rb

@@ -0,0 +1,55 @@
+module Pec
+  class Configure
+    class Sample
+      class << self
+        def pec_file
+          {
+            "your_sever_name" => {
+              "tenant" =>  "your_tenant",
+              "image" =>  "centos-7",
+              "flavor" =>  "m1.small",
+              "networks" => {
+                "eth0" => {
+                  "bootproto" => "static",
+                  "ip_address" => "10.0.0.0/24",
+                  "gateway" =>  "10.0.0.254",
+                  "dns1" => "10.0.0.10"
+                },
+                "eth1" => {
+                  "bootproto" => "static",
+                  "ip_address" => "20.0.0.11/24",
+                  "gateway" =>  "20.0.0.254",
+                  "dns1" => "20.0.0.10"
+                }
+              },
+              "security_group" => [
+                "default",
+                "www from any"
+              ],
+              "templates" => [
+                "web_server.yaml"
+              ],
+              "user_data" => {
+                  "hostname" => "pec",
+                  "fqdn" => "pec.pyama.com"
+               }
+            }
+          }
+        end
+        def user_data
+          {
+            "hostname" => "pec",
+            "fqdn" => "pec.pyama.com",
+            "users" => [
+              {
+                "name" => "centos",
+                "groups" => "sudo",
+                "shell" => "/bin/sh"
+              }
+            ]
+          }
+        end
+      end
+    end
+  end
+end

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -143,15 +143,23 @@ files:
 - bin/setup
 - exe/pec
 - lib/pec.rb
-- lib/pec/builder/port.rb
-- lib/pec/builder/server.rb
-- lib/pec/builder/user_data.rb
 - lib/pec/cli.rb
 - lib/pec/configure.rb
 - lib/pec/director.rb
-- lib/pec/errors.rb
+- lib/pec/handler.rb
+- lib/pec/handler/availability_zone.rb
+- lib/pec/handler/base.rb
+- lib/pec/handler/flavor.rb
+- lib/pec/handler/image.rb
+- lib/pec/handler/networks.rb
+- lib/pec/handler/networks/allowed_address_pairs.rb
+- lib/pec/handler/networks/ip_address.rb
+- lib/pec/handler/networks/option_base.rb
+- lib/pec/handler/templates.rb
+- lib/pec/handler/user_data.rb
 - lib/pec/init.rb
 - lib/pec/logger.rb
+- lib/pec/sample.rb
 - lib/pec/version.rb
 - pec.gemspec
 homepage: http://ten-snapon.com

data/lib/pec/builder/port.rb

@@ -1,120 +0,0 @@
-module Pec
-  module Builder
-    class Port
-      attr_reader :user_data
-      def build(host)
-        ports = []
-        @user_data = []
-
-        host.networks.each do |network|
-          validate(network)
-          Pec::Logger.notice "port create start : #{network[0]}"
-          port = create_port(host, network)
-          Pec::Logger.notice "assgin ip : #{port.fixed_ips.first["ip_address"]}"
-          ports << port
-          @user_data << gen_user_data(network, port)
-        end
-        {
-          nics: ports.map {|port| { port_id: port.id }}
-        }
-      end
-
-      def validate(network)
-        %w(
-          bootproto
-          ip_address
-        ).each do |k|
-          raise "network key #{k} is require" unless network[1][k]
-        end
-      end
-
-      def create_port(host, network)
-        ip = IP.new(network[1]['ip_address'])
-        subnet = Pec.neutron.subnets.find {|s|s.cidr == ip.network.to_s}
-        attribute = gen_port_attribute(host, network, subnet, ip)
-        Pec.neutron.ports.create(attribute)
-      end
-     
-      def gen_port_attribute(host, network, subnet, ip)
-        attribute = {
-          name: network[0],
-          network_id: subnet.network_id
-        }
-
-        attribute.merge!(
-          fixed_ip(subnet, ip) 
-        ) if ip.to_s != subnet.cidr
-
-        attribute.merge!(
-          security_group(host)
-        ) if host.security_group
-
-        attribute.merge!(
-          allowed_address_pairs(network)
-        ) if network[1]['allowed_address_pairs']
-        attribute
-      end
-     
-      def gen_user_data(network, port)
-        path = network[1]['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{port.name}"
-        {
-          'content' => ifcfg_config(network, port),
-          'owner' => "root:root",
-          'path' => path,
-          'permissions' => "0644"
-        }
-      end
-      
-      def ifcfg_config(network, port)
-        base = {
-          "name"      => port.name,
-          "device"    => port.name,
-          "type"      => 'Ethernet',
-          "onboot"    => 'yes',
-          "hwaddr"    => port.mac_address
-        }
-        
-        base.merge!(
-          {
-            "netmask" => IP.new(network[1]['ip_address']).netmask.to_s,
-            "ipaddr"  => port.fixed_ips.first['ip_address'].split("/").first
-          }
-        ) if network[1]['bootproto'] == "static"
-
-        # delete options
-        %w(allowed_address_pairs ip_address).each {|name| network[1].delete(name)}
-        
-        base.merge!(
-          network[1]
-        )
-
-        base.map {|k,v| "#{k.upcase}=#{v}"}.join("\n")
-      end
-
-      #
-      # after port options
-      #
-      def fixed_ip(subnet, ip)
-        { 
-          fixed_ips: [
-            { subnet_id: subnet.id, ip_address: ip.to_addr}
-          ]
-        }
-      end
-
-      def security_group(host)
-        ids =  host.security_group.map do |name|
-          Pec.neutron.security_groups.find {|sg| sg.name == name}.id
-        end
-        { security_groups: ids }
-      end
-
-      def allowed_address_pairs(network)
-        pairs = network[1]['allowed_address_pairs'].map do |pair|
-          { ip_address: pair['ip_address'] }
-        end
-        { allowed_address_pairs: pairs }
-      end
-    end
-  end
-end

data/lib/pec/builder/server.rb

@@ -1,28 +0,0 @@
-module Pec
-  module Builder
-    class Server
-      def build(host)
-        Pec::Logger.notice "flavor is #{host.flavor}"
-        Pec::Logger.notice "image is #{host.image}"
-        hash = {
-          name: host.name,
-          flavor_ref: fetch_flavor(host).id,
-          image_ref:  fetch_image(host).id
-        }
-        hash[:availability_zone] = host.availability_zone if host.availability_zone
-        hash
-      end
-      
-      def self.resource(name)
-        define_method("fetch_#{name}", -> (host) {
-          r = Pec.compute.send("#{name}s").find {|val|val.name == host.send(name)}
-          raise "not fond #{name} #{host.send(name)}" unless r
-          r
-        })
-      end
-
-      resource 'flavor'
-      resource 'image'
-    end
-  end
-end

data/lib/pec/builder/user_data.rb

@@ -1,39 +0,0 @@
-module Pec
-  module Builder
-    class UserData
-      def build(host, port_user_data) 
-          user_data = default(host)
-          user_data["write_files"] = port_user_data if port_user_data
-          if template = load_template(host)
-            user_data.deep_merge!(template) 
-          end 
-          { user_data: "#cloud-config\n" + user_data.to_yaml }
-      end
-
-      def load_template(host)
-        host.templates.inject({}) do |merge_template, template|
-          template.to_s.concat('.yaml') unless template.to_s.match(/.*\.yaml/)
-          raise "#{template} not fond!" unless FileTest.exist?("user_data/#{template}")
-          merge_template.deep_merge!(YAML.load_file("user_data/#{template}").to_hash)
-        end if host.templates
-      end 
-
-      def default(host)
-        _def = host.user_data || {}
-        _def['fqdn'] = host.name if host.user_data && !host.user_data['fqdn'] 
-        _def
-      end
-    end
-  end
-end
-
-class ::Hash
-    def deep_merge(second)
-        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-        self.merge(second.to_h, &merger)
-    end
-    def deep_merge!(second)
-        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-        self.merge!(second.to_h, &merger)
-    end
-end

data/lib/pec/errors.rb

@@ -1,14 +0,0 @@
-module Pec
-  module Errors
-    class Error < StandardError; end
-    class Ethernet < Error; end
-    class Subnet < Error; end
-    class Port < Error; end
-    class Host < Error; end
-    class Query < Error; end
-    class UserData < Error; end
-    class Configure < Error; end
-    class SecurityGroup < Error; end
-    class Resource < Error; end
-  end
-end