pec 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3a835c64ff11809c32ad8886aa25a8d5bf3600
-  data.tar.gz: f8a8e8fe3805263d737c63fb54249353ce2d32f5
+  metadata.gz: a23835f633410abdb1ca9c614c3d8e386101c17d
+  data.tar.gz: 7f3df00c0a75012a93898c33bc9b5f28eb213fa5
 SHA512:
-  metadata.gz: 04cd2b3871e58d6cfa4e0696ee318125b1bd7a22ded88fd4a4a75569c41503cc6d409474bbed67780e86881742e94e266bb116b6a9bc0745d831f4529e90f5e5
-  data.tar.gz: b425427f4e0328fb8e6737f2b1c3c057788ae8519fa2112529c3399fe155db65b5b46747768c645cda188934b97a6b88f7d15fb0666136926945b4694f3f1a69
+  metadata.gz: 2f05e20813ffd29318f0ae79608907412682b6aaa52371b7dce7d648351c470f4aba4aeea632020d5dc8b7ab85f6a7c02d2efff21619a33810c13703e6576557
+  data.tar.gz: 24b4f770903b98f04c28896c749d8fc784f4896ef2eb13c45cab6db9cc402ee8073d623e97492279dd0a7ce0579d5f1e99746a17f1b0e3cbe803d93d7a6390f7

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 /vendor
 *.yaml
+*.sample
+/user_datas

data/Gemfile

@@ -2,3 +2,13 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pec.gemspec
 gemspec
+gem 'fog', :git => 'git@github.com:pyama86/fog.git', :branch => 'support-security-groups'
+gem 'thor'
+gem 'ruby-ip'
+gem 'activesupport'
+gem "bundler"
+
+group :development, :test do
+  gem "rspec"
+  gem "rake"
+end

data/README.md

@@ -38,13 +38,13 @@ pyama-test001:
   networks:
     eth0:
       bootproto: static
-      ip_address: 157.7.190.128/26
-      gateway: 157.7.190.129
+      ip_address: 10.1.1.1/24
+      gateway: 10.1.1.254
       dns1: 8.8.8.8
       dns2: 8.8.8.8
     eth1:
       bootproto: static
-      ip_address: 10.51.113.0/24
+      ip_address: 20.2.2.0/24
       dns1: 8.8.8.8
       dns2: 8.8.8.8
   user_data:
@@ -57,16 +57,13 @@ pyama-test002:
   networks:
     eth0:
       bootproto: static
-      ip_address: 157.7.190.128/26
-      gateway: 157.7.190.129
+      ip_address: 10.0.0.64/26
+      gateway: 10.0.0.127
       dns1: 8.8.8.8
       dns2: 8.8.8.8
       path: /etc/sysconfig/network-scripts/ifcfg-bond0
     eth1:
-      bootproto: static
-      ip_address: 10.51.113.0/24
-      dns1: 8.8.8.8
-      dns2: 8.8.8.8
+      bootproto: dhcp
   user_data:
     hostname: pyama-test002
     fqdn: pyama-test002.ikemen.com

data/lib/pec.rb

@@ -4,6 +4,7 @@ require "pec/version"
 require "pec/query"
 require "pec/vm_director"
 require "pec/configure"
+require "pec/configure/sample"
 require "pec/configure/host"
 require "pec/configure/ethernet"
 require "pec/configure/user_data"

data/lib/pec/cli.rb

@@ -2,20 +2,43 @@ require 'pec'
 require 'thor'
 module Pec
   class CLI < Thor
-    option :filename, type: :string, aliases: "-f"
+
+    desc 'init', 'create sample config'
+    def init
+      dirname = "user_datas"
+      FileUtils.mkdir_p(dirname) unless FileTest.exist?(dirname)
+
+      open("Pec.yaml","w") do |e|
+        YAML.dump(Pec::Configure::Sample.pec_file, e)
+      end unless File.exist?("Pec.yaml")
+
+      open("#{dirname}/web_server.yaml.sample","w") do |e|
+        YAML.dump(Pec::Configure::Sample.user_data, e)
+      end if FileTest.exist?(dirname)
+
+    end
+
     desc 'up', 'create vm by Pec.yaml'
     def up(host_name = nil)
       config = Pec::Configure.new
       config.load("Pec.yaml")
+
       director = Pec::VmDirector.new
       config.each do |host|
         next if !host_name.nil? && host.name != host_name
         puts "can't create server:#{host.name}" unless director.make(host)
       end if config
     end
+    option :force , type: :boolean, aliases: "-f"
     desc "destroy", "delete vm"
-    def destroy(name)
-      Pec::Compute::Server.new.destroy!(name) if yes?("#{name}: Are you sure you want to destroy the '#{name}' VM? [y/N]")
+    def destroy(name = nil)
+      config = Pec::Configure.new
+      config.load("Pec.yaml")
+
+      config.each do |host|
+        next if !name.nil? && host.name != name
+        Pec::Compute::Server.new.destroy!(host.name) if yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]") || options["force"]
+      end if config
     end
   end
 end

data/lib/pec/compute/security_group.rb

@@ -2,6 +2,14 @@ module Pec
   class Compute
     class Security_Group
       include Query
+      def add_security_group(server_id, security_groups)
+        security_groups.each do |sg_name|
+          response = Fog::Compute[:openstack].add_security_group(server_id, sg_name)
+        end if security_groups
+        rescue Excon::Errors::Error => e
+          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
+          false
+      end
     end
   end
 end

data/lib/pec/compute/server.rb

@@ -4,26 +4,26 @@ module Pec
     class Server
       include Query
       def create(name, image_ref, flavor_ref, ports, options)
-        if exists?(name)
-          puts "skip create server! name:#{name} is exists!"
-          return true
-        end
-
         networks = ports.map do |port|
           if port.used?
             puts "port-id:#{port.id} ip-addr:#{port.ip_address} in used"
             return false
           end
-          { net_id: port.network_id, fixed_ip: port.ip_address, port_id: port.id }
+          puts "#{name}: assingn ip #{port.ip_address}"
+          { port_id: port.id }
         end if ports
 
         options.merge!({ 'nics' =>  networks })
+
         response = Fog::Compute[:openstack].create_server(name, image_ref, flavor_ref, options)
+
         if response[:status] == 202
           puts "success create for server_name:#{name}"
         end
-        true
-        rescue Excon::Errors::Conflict,Excon::Errors::BadRequest => e
+
+        response.data[:body]["server"]["id"]
+
+        rescue Excon::Errors::Error => e
           JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
           false
       end
@@ -40,9 +40,14 @@ module Pec
         end
 
         response = Fog::Compute[:openstack].delete_server(server["id"]) if server
+
         if response && response[:status] == 204
           puts "server_name:#{server_name} is deleted!"
         end
+
+        rescue Excon::Errors::Error => e
+          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
+          false
       end
     end
   end

data/lib/pec/configure/ethernet.rb

@@ -4,7 +4,7 @@ module Pec
       attr_reader :name, :bootproto, :ip_address, :options
       def initialize(config)
         @name = config[0];
-        @bootprot = config[1]["bootproto"];
+        @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"
@@ -17,7 +17,7 @@ module Pec
         end
 
         def check_require_key(name, config)
-          err = %w(bootproto ip_address).find {|k| !config[1].key?(k)}
+          err = %w(bootproto).find {|k| !config[1].key?(k)}
           return true if err.nil?
           puts "skip! #{name}: #{err} is required!"
           false

data/lib/pec/configure/host.rb

@@ -1,13 +1,14 @@
 module Pec
   class Configure
     class Host
-      attr_reader :name, :image, :flavor,:security_group, :user_data, :networks
+      attr_reader :name, :image, :flavor,:security_group, :user_data, :networks, :templates
       def initialize(config)
         @name = config[0];
         @image = config[1]["image"];
         @flavor = config[1]["flavor"];
         @security_group = config[1]["security_group"];
         @user_data = config[1]["user_data"];
+        @templates = config[1]["templates"]
       end
 
       def append_network(network)
@@ -20,8 +21,7 @@ module Pec
           host = self.new(config) if check_require_key(config)
           config[1]["networks"].each do |net|
             net_config = Pec::Configure::Ethernet.load(config[0], net)
-            return nil unless net_config
-            host.append_network(net_config)
+            host.append_network(net_config) if net_config
           end if host && config[1]["networks"]
           host
         end

data/lib/pec/configure/sample.rb

@@ -0,0 +1,54 @@
+module Pec
+  class Configure
+    class Sample
+      class << self
+        def pec_file
+          {
+            "sever_name" => {
+              "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"
+              ],
+              "template" => "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/configure/user_data.rb

@@ -6,12 +6,28 @@ module Pec
         def make(config, ports)
           user_data = {}
           user_data["write_files"] = make_port_content(config, ports) if ports
-          Base64.encode64("#cloud-config\n" + user_data.merge(config.user_data).to_yaml)
+          user_data.merge!(config.user_data) if config.user_data
+          user_data.merge!(get_template(config)) if get_template(config)
+          Base64.encode64("#cloud-config\n" + user_data.to_yaml)
+        end
+
+        def get_template(config)
+          merge_template = {}
+          config.templates.each do |template|
+            if FileTest.exist?("user_datas/#{template}")
+              merge_template.merge!(YAML.load_file("user_datas/#{template}").to_hash)
+            else
+              puts "template:#{temlate} is not fond!"
+            end
+          end if config.templates
+          merge_template
         end
 
         def make_port_content(config, ports)
           config.networks.map do |ether|
             port_content = {}
+            port_content["bootproto"] = ether.bootproto
+            port_content["name"] = ether.name unless ether.options.key?('name')
             port_content["name"] = ether.name unless ether.options.key?('name')
             port_content["device"] = ether.name unless ether.options.key?('device')
             port_content["type"] = 'Ethernet' unless ether.options.key?('type')
@@ -22,9 +38,11 @@ module Pec
             port = ports.find {|p| p.name == ether.name}
 
             if port
-              port_content["netmask"] = port.netmask
+              if ether.bootproto == "static"
+                port_content["netmask"] = port.netmask
+                port_content["ipaddr"] = port.ip_address
+              end
               port_content["hwaddr"] = port.mac_address
-              port_content["ipaddr"] = port.ip_address
             end
             port_content.merge!(ether.options)
             {

data/lib/pec/network/port.rb

@@ -2,18 +2,53 @@ require 'json'
 module Pec
   class Network
     class Port
+      @@use_ip_list = []
       attr_reader :name, :subnet
       include Query
-      def initialize(name, ip_addr, subnet)
+      def initialize(name, ip_addr, subnet, security_groups)
         @name = name
         @subnet = subnet
+        @security_groups = security_groups
         @config = fetch(ip_addr)
       end
 
+      def assign!(ip)
+        # dhcp ip recycle
+        if request_any_address?(ip)
+          free = fetch_free_port
+          if free
+            ip = IP.new("#{free["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}")
+            @config = free
+          end
+        end
+
+        case
+        when exists? && !used?
+          replace(ip)
+        when !exists?
+          create(ip)
+        when used?
+          false
+        end
+      end
+
+      def request_any_address?(ip)
+        ip.to_s == subnet["cidr"]
+      end
+
       def fetch(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"])
+        end
+      end
+
       def exists?
         !@config.nil?
       end
@@ -43,36 +78,34 @@ module Pec
       end
 
       def create(ip)
-        options = {}
-        ## parameter is network address to dhcp
+        options = { security_groups: @security_groups }
         if ip.to_s != subnet["cidr"]
-          options = { fixed_ips: [{ subnet_id: @subnet["id"], ip_address: ip.to_addr}]}
+          options.merge!({ fixed_ips: [{ subnet_id: @subnet["id"], ip_address: ip.to_addr}]})
         end
+        response = Fog::Network[:openstack].create_port(@subnet["network_id"], options)
 
-        res = Fog::Network[:openstack].create_port(@subnet["network_id"], options)
+        if response
+          @config = response.data[:body]["port"] 
+          @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
+          response.data[:body]["port"]["id"]
+        end
 
-        @config = res.data[:body]["port"] if res
-        @@_list['port'] ||= []
-        @@_list['port'] << @config
-        true
-        rescue Excon::Errors::Conflict => e
+        rescue Excon::Errors::Error => e
           JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
           false
       end
 
-      def delete(port_id)
-        Fog::Network[:openstack].delete_port(port_id)
-        rescue Excon::Errors::Conflict => e
+      def delete(ip)
+        port = fetch(ip.to_addr)
+        response =  Fog::Network[:openstack].delete_port(port["id"]) if port
+        rescue Excon::Errors::Error => e
           JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
           false
       end
 
       def replace(ip)
-        delete(id)
-        @@_list['port'] = nil
-        create(ip)
+        create(ip) if delete(ip)
       end
-
     end
   end
 end

data/lib/pec/query.rb

@@ -2,7 +2,6 @@ require 'active_support/core_ext/string/inflections'
 require 'fog'
 module Pec
   module Query
-    @@_list = Hash.new
     def get_adapter
       case
       when self.class.name.include?('Network')
@@ -16,7 +15,8 @@ module Pec
 
     def list
       name = self.class.name.demodulize.downcase+"s"
-      @@_list[name] || get_adapter.send("list_#{name}").data[:body][name]
+      @_list ||= Hash.new
+      @_list[name] ||= get_adapter.send("list_#{name}").data[:body][name]
     end
 
     def fetch(name)

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/pec/vm_director.rb

@@ -9,15 +9,20 @@ module Pec
     end
 
     def make(config)
+      if @compute.exists?(config.name)
+        puts "skip create server! name:#{config.name} is exists!"
+        return true
+      end
+
       ports = get_ports(config)
       flavor_ref = get_flavor(config.flavor)
       image_ref = get_image(config.image)
+
       return false unless flavor_ref && image_ref
+
       options = {
         "user_data" => Pec::Configure::UserData.make(config, ports),
-        "security_groups" => config.security_group
       }
-
       @compute.create(config.name, image_ref, flavor_ref, ports, options)
     end
 
@@ -25,20 +30,9 @@ module Pec
       config.networks.map do |ether|
         ip = IP.new(ether.ip_address)
         _subnet = get_subnet(ip)
-        return false unless _subnet
-
-        _port = Pec::Network::Port.new(ether.name, ip.to_addr, _subnet)
+        _port = Pec::Network::Port.new(ether.name, ip.to_addr, _subnet, get_security_group_id(config.security_group)) if _subnet
 
-        res = case
-        when _port.exists? && !_port.used?
-          _port.replace(ip)
-        when !_port.exists?
-          _port.create(ip)
-        when _port.used?
-          false
-        end
-
-        unless res
+        unless _port.assign!(ip)
           puts "ip addess:#{ip.to_addr} can't create port!"
           return false
         end
@@ -63,5 +57,12 @@ module Pec
       puts "image:#{name} not fond!" if image_ref.nil?
       image_ref
     end
+
+    def get_security_group_id(security_groups)
+      security_groups.map do |name|
+        sg = @security_group.fetch(name)
+        sg["id"] if sg
+      end if security_groups
+    end
   end
 end

data/pec.gemspec

@@ -17,10 +17,4 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_dependency 'fog'
-  spec.add_dependency 'thor'
-  spec.add_dependency 'ruby-ip'
-  spec.add_dependency 'activesupport'
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,99 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-ip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+date: 2015-06-08 00:00:00.000000000 Z
+dependencies: []
 description: openstac vm booter.
 email:
 - pyama@pepabo.com
@@ -122,6 +38,7 @@ files:
 - lib/pec/configure.rb
 - lib/pec/configure/ethernet.rb
 - lib/pec/configure/host.rb
+- lib/pec/configure/sample.rb
 - lib/pec/configure/user_data.rb
 - lib/pec/network/port.rb
 - lib/pec/network/subnet.rb