pec 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23835f633410abdb1ca9c614c3d8e386101c17d
-  data.tar.gz: 7f3df00c0a75012a93898c33bc9b5f28eb213fa5
+  metadata.gz: 409aebdf8468165b18f5bf9e130a64c0e8d52e89
+  data.tar.gz: 79635469bbd61536714e08715cfafe4a9c5ab77e
 SHA512:
-  metadata.gz: 2f05e20813ffd29318f0ae79608907412682b6aaa52371b7dce7d648351c470f4aba4aeea632020d5dc8b7ab85f6a7c02d2efff21619a33810c13703e6576557
-  data.tar.gz: 24b4f770903b98f04c28896c749d8fc784f4896ef2eb13c45cab6db9cc402ee8073d623e97492279dd0a7ce0579d5f1e99746a17f1b0e3cbe803d93d7a6390f7
+  metadata.gz: 683b49175521024e1a3d617678efd3fdc4896a3905c1d25827c6fb0eb2b2be055ba6d971b1468b0572cb0d0f7c0437ee953ff2bec9ef51470ba875b61143c0da
+  data.tar.gz: 58be8b103ec3b6353d0eba896d31b1c4738dec33a6fc8f0b85f3710c5f3f70a63fd04b942306f9435901ad9349194fbf4b6bfaedbeba025f84dae8abe2ed1380

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

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

data/Gemfile

@@ -12,3 +12,6 @@ group :development, :test do
   gem "rspec"
   gem "rake"
 end
+group :test do
+  gem 'coveralls', :require => false
+end

data/README.md

@@ -1,25 +1,33 @@
 # Pec
-
+[![Build Status](https://travis-ci.org/pyama86/pec.svg?branch=master)](https://travis-ci.org/pyama86/pec)
 OpenStackにおいて複数サーバの起動や、
 DHCPサーバがない状況でのIP自動採番を実現します。
 
-## インストール方法
+## Install
 
 
     $ gem install pec
 
-## 使用方法
-### コマンド
-実行ディレクトリに存在するPec.yamlに基づきホストを作成します。
-ホスト名が指定された場合はそのホストのみ作成します。
+## Usage
+
+定義ファイル作成
+
+    $ pec init
+
+```
+create - /Pec.yaml
+create - /user_datas/web_server.yaml.sample
+```
+        
+Pec.yamlに基づきホストを作成します。
+ホスト名が指定された場合はそのホストのみ作成、削除します。
 
     $ pec up <hostname>
 
     $ pec destroy <hostname>
 
-### 設定ファイル
-[fog](https://github.com/fog/fog)を利用しているので、fogの設定を行ってください。
-
+### Configure
+#### ~/.fog
 ```
 % cat ~/.fog
 default:
@@ -30,7 +38,7 @@ default:
 ```
 
 
-`実行ディレクトリ/Pec.yaml`にVMの設定を実施します。
+#### Pec.yaml
 ```
 pyama-test001:
   image: centos-7.1_chef-12.3_puppet-3.7
@@ -43,10 +51,13 @@ pyama-test001:
       dns1: 8.8.8.8
       dns2: 8.8.8.8
     eth1:
-      bootproto: static
-      ip_address: 20.2.2.0/24
-      dns1: 8.8.8.8
-      dns2: 8.8.8.8
+      bootproto: dhcp
+  security_group:
+  - default
+  - ssh
+  templates:
+  - base.yaml
+  - webserver.yaml
   user_data:
     hostname: pyama-test001
     fqdn: pyama-test001.ikemen.com
@@ -54,28 +65,30 @@ pyama-test001:
 pyama-test002:
   image: centos-7.1_chef-12.3_puppet-3.7
   flavor: m1.midium
-  networks:
-    eth0:
-      bootproto: static
-      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: dhcp
-  user_data:
-    hostname: pyama-test002
-    fqdn: pyama-test002.ikemen.com
-    repo_releasever: 7.1.1503
+・・・
+
 ```
-`VM名`,`image`,`flavor`は必須項目です。
-`networks`について指定する場合は、`bootproto`,`ip_address`が必須です。`ip_address`は`xxx.xxx.xxx.xxx/yy`の方式を想定しており、ネットワークアドレスが指定された場合、そのサブネットで未使用のアドレスを自動で採番します。
-またnetworksが指定された場合は自動でVM内に`/etc/sysconfig/network-script/ifcfg-ethXXX`を作成します。
-ファイルの保存パスに指定が必要な場合は`path`を指定してください。
-`bootproto`,`ip_address`,`path`以外の値が設定されている場合は、`ifcfg-ethXXX`にそのままの値が`KEY=value`形式で出力されます。
-`user_data`については`nova api`にネットワーク設定を加えて引き渡すため、cloud-init記法に準拠します。
+##### Detail
+
+| 項目名         | 説明                                           | 必須 | 例示                            |
+| -------------- | ---------------------------------------------- | ---- | ------------------------------- |
+| instance_name| インスタンス名                                              | ○    | pyama-test001                   |
+| image          | イメージ名                                     | ○    | centos-7.1_chef-12.3_puppet-3.7 |
+| flavor         | フレーバー名                                   | ○    | m1.small                        |
+| networks       | ネットワーク定義                               | -    | []                            |
+| security_group | セキュリティグループ名                         | -    | [default,ssh]                   |
+| templates      | `user_data`のテンプレート.`./user_datas`に配置 | -    | [base.yaml,webserver.yaml]      |
+| user_data      | cloud-init記法に準拠                           | -    | -                               |
 
+##### Networks
+| 項目名       | 説明             | 必須 | 例示           |
+| ------------ | ---------------- | ---- | -------------- |
+| device_name | デバイス名       | ○    | eth0           |
+| bootproto    | 設定方式         | ○    | static or dhcp |
+| ip_address   | IPアドレス(CIDR) | ※    | 10.1.1.1/24    |
+| path   | NW設定保存パス |     | default:/etc/sysconfig/network-scripts/ifcfg-[device_name]    |
+※ bootproto=staticの場合必須
+上記以外の項目は設定ファイルに`KEY=value`形式で出力されます。
 
 ## Author
 * pyama86

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new("spec")
+task :default => :spec

data/lib/pec.rb

@@ -2,6 +2,7 @@ require 'fog'
 require 'ip'
 require "pec/version"
 require "pec/query"
+require "pec/errors"
 require "pec/vm_director"
 require "pec/configure"
 require "pec/configure/sample"

data/lib/pec/cli.rb

@@ -6,12 +6,16 @@ module Pec
     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")
-
+      unless FileTest.exist?(dirname)
+        FileUtils.mkdir_p(dirname) 
+        puts "create directry user_datas"
+      end
+      unless File.exist?("Pec.yaml")
+        open("Pec.yaml","w") do |e|
+          YAML.dump(Pec::Configure::Sample.pec_file, e)
+        end
+        puts "create configure file Pec.yaml"
+      end
       open("#{dirname}/web_server.yaml.sample","w") do |e|
         YAML.dump(Pec::Configure::Sample.user_data, e)
       end if FileTest.exist?(dirname)
@@ -24,21 +28,41 @@ module Pec
       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)
+
+        begin
+          director.make(host)
+        rescue Pec::Errors::Error => e
+          puts e
+          puts "can't create server:#{host.name}"
+        rescue Excon::Errors::Error => e
+          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
+        end
       end if config
+      rescue Errno::ENOENT => e
+        puts e
+      rescue Pec::Errors::Configure => e
+        puts "configure can't load"
     end
+
     option :force , type: :boolean, aliases: "-f"
     desc "destroy", "delete vm"
     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"]
+        begin
+          Pec::Compute::Server.new.destroy!(host.name) if options[:force] || yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
+        rescue Pec::Errors::Error => e
+          puts e
+          puts "can't create server:#{host.name}"
+        end
       end if config
+      rescue Errno::ENOENT => e
+        puts e
     end
   end
 end

data/lib/pec/compute/security_group.rb

@@ -6,9 +6,6 @@ module Pec
         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

data/lib/pec/compute/server.rb

@@ -5,10 +5,7 @@ module Pec
       include Query
       def create(name, image_ref, flavor_ref, ports, options)
         networks = ports.map do |port|
-          if port.used?
-            puts "port-id:#{port.id} ip-addr:#{port.ip_address} in used"
-            return false
-          end
+          raise(Pec::Errors::Port, "port-id:#{port.id} ip-addr:#{port.ip_address} in used") if port.used?
           puts "#{name}: assingn ip #{port.ip_address}"
           { port_id: port.id }
         end if ports
@@ -22,10 +19,6 @@ module Pec
         end
 
         response.data[:body]["server"]["id"]
-
-        rescue Excon::Errors::Error => e
-          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
-          false
       end
 
       def exists?(server_name)
@@ -34,20 +27,12 @@ module Pec
 
       def destroy!(server_name)
         server = fetch(server_name)
-        unless server
-          puts "server_name:#{server_name} is not fond!"
-          return
-        end
-
+        raise(Pec::Errors::Host, "server_name:#{server_name} is not fond!") unless server
         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.rb

@@ -9,8 +9,8 @@ module Pec
         @configure ||= []
         @configure << host if host
       end
-      rescue Psych::SyntaxError => e
-        puts e
+      rescue Psych::SyntaxError,NoMethodError => e
+        raise(Pec::Errors::Configure, e)
     end
 
     def each

data/lib/pec/configure/ethernet.rb

@@ -18,23 +18,19 @@ module Pec
 
         def check_require_key(name, config)
           err = %w(bootproto).find {|k| !config[1].key?(k)}
-          return true if err.nil?
-          puts "skip! #{name}: #{err} is required!"
-          false
+          raise(Pec::Errors::Ethernet, "skip! #{name}: #{err} is required!") unless err.nil?
+          true
         end
 
         def check_network_key(name, config)
           net = config[1]
           case
           when (net["bootproto"] == "static" && net["ip_address"].nil?)
-            puts "skip! #{name}: ip_address is required by bootproto static"
-            return false
+            raise(Pec::Errors::Ethernet, "skip! #{name}: ip_address is required by bootproto static")
           when (!net["bootproto"] == "static" && !net["bootproto"] == "dhcp")
-            puts "skip! #{name}: bootproto set the value dhcp or static"
-            return false
+            raise(Pec::Errors::Ethernet, "skip! #{name}: bootproto set the value dhcp or static")
           when (!net["bootproto"] == "static" && !net["bootproto"] == "dhcp")
-            puts "skip! #{name}: bootproto set the value dhcp or static"
-            return false
+            raise(Pec::Errors::Ethernet, "skip! #{name}: bootproto set the value dhcp or static")
           end
           true
         end

data/lib/pec/configure/host.rb

@@ -28,9 +28,8 @@ module Pec
 
         def check_require_key(config)
           err = %w(image flavor).find {|r| !config[1].key?(r)}
-          return true if err.nil?
-          puts "skip! #{config[0]}: #{err} is required!"
-          false
+          raise(Pec::Errors::Host,"skip! #{config[0]}: #{err} is required!") unless  err.nil?
+          true
         end
       end
     end

data/lib/pec/configure/user_data.rb

@@ -12,43 +12,36 @@ module Pec
         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
+          config.templates.inject({}) do |merge_template, template|
+            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
-          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')
-            port_content["onboot"] = "yes" unless ether.options.key?('onboot')
+            %w(name device).each do |k|
+              port_content[k] = ether.name unless ether.options.key?(k)
+            end
 
-            _path = "/etc/sysconfig/network-scripts/ifcfg-#{ether.name}" unless ether.options.key?('path')
+            port_content["bootproto"] = ether.bootproto
+            port_content["type"] = ether.options['type'] ||'Ethernet'
+            port_content["onboot"] = ether.options['onboot'] || 'yes'
+            path = ether.options['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{ether.name}"
 
             port = ports.find {|p| p.name == ether.name}
+            port_content["hwaddr"] = port.mac_address
 
-            if port
-              if ether.bootproto == "static"
-                port_content["netmask"] = port.netmask
-                port_content["ipaddr"] = port.ip_address
-              end
-              port_content["hwaddr"] = port.mac_address
+            if ether.bootproto == "static"
+              port_content["netmask"] = port.netmask
+              port_content["ipaddr"] = port.ip_address
             end
             port_content.merge!(ether.options)
             {
               'content' => port_content.map {|k,v| "#{k.upcase}=#{v}"}.join("\n"),
               'owner' => "root:root",
-              'path' => _path,
+              'path' => path,
               'permissions' => "0644"
             }
           end

data/lib/pec/errors.rb

@@ -0,0 +1,12 @@
+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
+  end
+end

data/lib/pec/network/port.rb

@@ -28,7 +28,7 @@ module Pec
         when !exists?
           create(ip)
         when used?
-          false
+          raise(Pec::Errors::Port, "ip:#{ip.to_addr} is used!")
         end
       end
 
@@ -89,18 +89,11 @@ module Pec
           @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
           response.data[:body]["port"]["id"]
         end
-
-        rescue Excon::Errors::Error => e
-          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
-          false
       end
 
       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)

data/lib/pec/network/subnet.rb

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

data/lib/pec/query.rb

@@ -24,7 +24,9 @@ module Pec
     end
 
     def get_ref(name)
+      class_name = self.class.name.demodulize.downcase
       response = fetch(name)
+      raise(Pec::Errors::Query, "#{class_name}:#{name} ref is not fond!") unless response
       response["links"][0]["href"]
     end
   end

data/lib/pec/version.rb

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

data/lib/pec/vm_director.rb

@@ -15,47 +15,28 @@ module Pec
       end
 
       ports = get_ports(config)
-      flavor_ref = get_flavor(config.flavor)
-      image_ref = get_image(config.image)
+      flavor_ref = @flavor.get_ref(config.flavor)
+      image_ref = @image.get_ref(config.image)
+      options = { "user_data" => Pec::Configure::UserData.make(config, ports) }
 
-      return false unless flavor_ref && image_ref
-
-      options = {
-        "user_data" => Pec::Configure::UserData.make(config, ports),
-      }
       @compute.create(config.name, image_ref, flavor_ref, ports, options)
     end
 
     def get_ports(config)
       config.networks.map do |ether|
-        ip = IP.new(ether.ip_address)
-        _subnet = get_subnet(ip)
-        _port = Pec::Network::Port.new(ether.name, ip.to_addr, _subnet, get_security_group_id(config.security_group)) if _subnet
-
-        unless _port.assign!(ip)
-          puts "ip addess:#{ip.to_addr} can't create port!"
-          return false
+        begin
+          ip = IP.new(ether.ip_address)
+        rescue ArgumentError => e
+          raise(Pec::Errors::Port, "ip:#{ether.ip_address} #{e}")
         end
-        _port
-      end if config.networks
-    end
 
-    def get_subnet(ip)
-      _subnet = @subnet.fetch(ip.network.to_s)
-      puts "ip addess:#{ip.to_addr} subnet not fond!" if _subnet.nil?
-      _subnet
-    end
-
-    def get_flavor(name)
-      flavor_ref = @flavor.get_ref(name)
-      puts "flavor:#{name} not fond!" if flavor_ref.nil?
-      flavor_ref
-    end
+        subnet = @subnet.fetch(ip.network.to_s)
+        raise(Pec::Errors::Subnet, "subnet:#{ip.network.to_s} is not fond!") unless subnet
 
-    def get_image(name)
-      image_ref = @image.get_ref(name)
-      puts "image:#{name} not fond!" if image_ref.nil?
-      image_ref
+        port = Pec::Network::Port.new(ether.name, ip.to_addr, subnet, get_security_group_id(config.security_group))
+        raise(Pec::Errors::Port, "ip addess:#{ip.to_addr} can't create port!") unless port.assign!(ip)
+        port
+      end if config.networks
     end
 
     def get_security_group_id(security_groups)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies: []
 description: openstac vm booter.
 email:
@@ -20,6 +20,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -40,6 +41,7 @@ files:
 - lib/pec/configure/host.rb
 - lib/pec/configure/sample.rb
 - lib/pec/configure/user_data.rb
+- lib/pec/errors.rb
 - lib/pec/network/port.rb
 - lib/pec/network/subnet.rb
 - lib/pec/query.rb
@@ -66,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: openstack vm booter.