pec 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2605a0a503984011df0eab8a874008286bb01ad9
-  data.tar.gz: 3669c9b826b620cf233fb3e66d8a268010800f96
+  metadata.gz: bf28083dd8187e302dd251c338c800cefaffe4d9
+  data.tar.gz: bbb7ff389e5c5be0a97f8afbeb203681e26f6bd7
 SHA512:
-  metadata.gz: 1de8c4f81632853c43075b064bb6a385b9039672c2c0a2ba801fc7046212fad1ed43eb882a456f4d29418415a8cd1ad53c53013f2e7fff866ac88abaf9a0e334
-  data.tar.gz: 6d7a8b1e4ab630e61e3032eb2cf0748610ff9dcf2fc83d9fbf1b8e0d63c55544762e41f0b64ee4bd2982f25bd6c2f81024de5b2f578e88e8d8a8061cabc6a925
+  metadata.gz: 662c961455e89a1f2869f9e678c522806d2751866908f26b5efc154d214ee7ab957276697dee475fe5a90c791428c79be81c6628002da09f9ab4a0a9206a6b99
+  data.tar.gz: 52ae51ea07c15324bb20ec7fa4e428941464feda24ceb740442fd18fd182ea25a881270b8f78bbe645cb1abcc8ea1ba8cc6a83d1e28e6a457ff8b8e98eae997d

data/README.md

@@ -39,7 +39,8 @@ pyama-test001:
   networks:
     eth0:
       bootproto: static
-      allowed_address_pairs: 10.1.1.5/24
+      allowed_address_pairs:
+      - 10.1.1.5/24
       ip_address: 10.1.1.1/24
       gateway: 10.1.1.254
       dns1: 8.8.8.8
@@ -83,7 +84,7 @@ pyama-test002:
 | bootproto             |    ○    | static or dhcp                                             |
 | ip_address            |    ※    | 10.1.1.1/24                                                |
 | path                  |         | default:/etc/sysconfig/network-scripts/ifcfg-[device_name] |
-| allowed_address_pairs |         | 10.1.1.2/24                                                |
+| allowed_address_pairs |         | [10.1.1.2/24]                                              |
 
 ※ bootproto=static is required
 Items other than the above are output to the configuration file with `KEY = value` format

data/lib/pec.rb

@@ -1,35 +1,28 @@
-require 'fog'
+require 'pp'
+require 'base64'
+require 'yao'
+require 'yaml'
+require 'thor'
 require 'ip'
 require 'colorator'
 require "pec/version"
 require "pec/logger"
 require "pec/configure"
-require "pec/director"
 require "pec/handler"
 require "pec/sample"
 require "pec/init"
 require "pec/cli"
 
+
 module Pec
-  def self.compute
-    @_compute ||= Fog::Compute.new({
-      provider: 'openstack'
-    })
-    @_compute
-  end
-  
-  def self.neutron
-    @_neutron ||= Fog::Network.new({
-      provider: 'openstack'
-    })
-    @_neutron
-  end
-  
-  def self.identity
-    @_identity ||= Fog::Identity.new({
-      provider: 'openstack'
-    })
-    @_identity
+  def self.init_yao(_tenant_name=nil)
+    check_env
+    Yao.configure do
+      auth_url "#{ENV["OS_AUTH_URL"]}/tokens"
+      username ENV["OS_USERNAME"]
+      password ENV["OS_PASSWORD"]
+      tenant_name _tenant_name || ENV["OS_TENANT_NAME"]
+    end
   end
 
   def self.load_config(file_name=nil)
@@ -44,10 +37,20 @@ module Pec
     load_config unless @_configure
     @_configure
   end
+
+  def self.check_env
+    %w(
+      OS_AUTH_URL
+      OS_USERNAME
+      OS_PASSWORD
+    ).each do |name|
+      raise "please set env #{name}" unless ENV[name]
+    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)
@@ -57,3 +60,4 @@ class ::Hash
     self.merge!(deep_merge(second))
   end
 end
+

data/lib/pec/cli.rb

@@ -1,30 +1,105 @@
 require 'pec'
-require 'thor'
 module Pec
   class CLI < Thor
 
     desc 'init', 'create sample config'
     def init
-      Pec::Init.create_fog_config
+      Pec::Init.show_env_setting
       Pec::Init.create_template_dir
       Pec::Init.create_sample_config
     end
 
     desc 'up', 'create vm by Pec.yaml'
     def up(host_name = nil)
-      Pec::Director.make(host_name)
+      Pec.configure.each do |host|
+        next if host_name && host.name != host_name
+        Pec.init_yao(host.tenant)
+
+        server = Yao::Server.list_detail.find {|s|s.name == host.name}
+        if server
+          Pec::Logger.notice "already exists: #{host.name}"
+          next
+        end
+        Pec::Logger.info "make start #{host.name}"
+
+        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
+        p 1
+        attribute[:user_data] = Base64.encode64("#cloud-config\n" + attribute[:user_data].to_yaml) if attribute[:user_data]
+
+        Yao::Server.create(attribute)
+        Pec::Logger.info "create success! #{host.name}"
+      end
+      rescue => e
+        print_exception(e)
     end
 
     option :force , type: :boolean, aliases: "-f"
     desc "destroy", "delete vm"
     def destroy(host_name = nil)
-      Pec::Director.destroy(host_name, options)
+      Pec.configure.each do |host|
+        next if host_name && host.name != host_name
+        Pec.init_yao(host.tenant)
+
+        server = Yao::Server.list_detail.find {|s|s.name == host.name}
+        unless server
+          Pec::Logger.notice "not be created #{host.name}"
+          next
+        end
+
+        if options[:force] || yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
+          Yao::Server.destroy(server.id)
+          Pec::Logger.info "#{host.name} is deleted!"
+        end
+      end
+
+      rescue => e
+        print_exception(e)
     end
 
     desc "status", "vm status"
     def status(host_name = nil)
       say("Current machine stasus:", :yellow)
-      Pec::Director.status(host_name)
+      Pec.configure.each do |host|
+        next if host_name && host.name != host_name
+        Pec.init_yao(host.tenant)
+        if server = Yao::Server.list_detail.find {|s|s.name == host.name}
+          puts sprintf(" %-35s %-10s %-10s %-10s %-10s %-35s %-48s",
+            host.name,
+            server.status,
+            Yao::Tenant.list.find {|tenant| tenant.id == server.tenant_id}.name,
+            Yao::Flavor.get(server.flavor['id']).name,
+            server.availability_zone,
+            server.ext_srv_attr_host,
+            server.addresses.map do |ethers|
+              ethers[1].map do |ether|
+                ether["addr"]
+              end
+            end.flatten.join(",")
+          )
+        else
+          puts sprintf(" %-35s %-10s",
+            host.name,
+            "uncreated"
+          )
+        end
+      end
+
+      rescue => e
+        print_exception(e)
+    end
+    no_commands do
+
+      def print_exception(e)
+        Pec::Logger.critical(e)
+        Pec::Logger.info("\t" + e.backtrace.join("\n\t"))
+      end
     end
   end
 end

data/lib/pec/configure.rb

@@ -19,7 +19,7 @@ module Pec
 
     def validate(host)
       %w(
-        tenant 
+        tenant
         image
         flavor
         networks

data/lib/pec/handler/base.rb

@@ -2,14 +2,8 @@ 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
-        })
+      def build
+        raise "not defined method"
       end
     end
   end

data/lib/pec/handler/flavor.rb

@@ -5,7 +5,7 @@ module Pec::Handler
     def self.build(host)
       Pec::Logger.notice "flavor is #{host.flavor}"
       {
-        flavor_ref: fetch_flavor(host).id,
+        flavorRef:  Yao::Flavor.list.find {|flavor| flavor.name == host.flavor}.id
       }
     end
   end

data/lib/pec/handler/image.rb

@@ -5,7 +5,7 @@ module Pec::Handler
     def self.build(host)
       Pec::Logger.notice "image is #{host.image}"
       {
-        image_ref:  fetch_image(host).id
+        imageRef:  Yao::Image.list.find {|image| image.name == host.image}.id
       }
     end
   end

data/lib/pec/handler/networks.rb

@@ -1,10 +1,10 @@
 module Pec::Handler
-  class Networks < Base 
+  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
@@ -22,7 +22,7 @@ module Pec::Handler
           user_data << gen_user_data(network, port)
         end
         {
-          nics: ports.map {|port| { port_id: port.id }},
+          networks: ports.map {|port| { uuid: nil, port: port.id }},
           user_data: {
             'write_files' => user_data
           }
@@ -40,17 +40,17 @@ module Pec::Handler
 
       def create_port(host, network)
         attribute = gen_port_attribute(host, network)
-        Pec.neutron.ports.create(attribute)
+        Yao::Port.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}
+        subnet = Yao::Subnet.list.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
@@ -66,7 +66,7 @@ module Pec::Handler
 
         attribute
       end
-     
+
       def gen_user_data(network, port)
         path = network[CONFIG]['path'] || "/etc/sysconfig/network-scripts/ifcfg-#{port.name}"
         {
@@ -76,7 +76,7 @@ module Pec::Handler
           'permissions' => "0644"
         }
       end
-      
+
       def ifcfg_config(network, port)
         base = {
           "name"      => port.name,
@@ -95,7 +95,7 @@ module Pec::Handler
         # delete option column
         Pec::Handler::Networks.constants.each do |c|
           network[CONFIG].delete(Object.const_get("Pec::Handler::Networks::#{c}").kind)
-        end 
+        end
 
         base.merge!(
           network[CONFIG]
@@ -105,7 +105,9 @@ module Pec::Handler
 
       def security_group(host)
         ids = host.security_group.map do |name|
-          Pec.neutron.security_groups.find {|sg| sg.name == name}.id
+          sg = Yao::SecurityGroup.list.find {|sg| sg.name == name}
+          raise "security group #{name} is not found" unless sg
+          sg.id
         end
         { security_groups: ids }
       end

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

@@ -6,7 +6,7 @@ module Pec::Handler
         def build(network)
           if network[1]['allowed_address_pairs']
             pairs = network[1]['allowed_address_pairs'].map do |pair|
-              { ip_address: pair['ip_address'] }
+              { ip_address: pair }
             end
             { allowed_address_pairs: pairs }
           end

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

@@ -5,10 +5,10 @@ module Pec::Handler
       class << self
         def build(network)
           ip = IP.new(network[1]['ip_address'])
-          subnet = Pec.neutron.subnets.find {|s|s.cidr == ip.network.to_s}
+          subnet = Yao::Subnet.list.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}
               ]

data/lib/pec/init.rb

@@ -21,21 +21,12 @@ module Pec
         end
       end
 
-      def create_fog_config
-        thor = Thor.new
-        if !File.exist?(File.expand_path("~/.fog")) || thor.yes?("Do you want to overwrite the existing ~/.fog? [y/N]")
-          thor.say("Start Configure by OpenStack", :yellow)
-          params = {}
-
-          params = %w(auth_url username api_key tenant).inject({}) do |user_input, c|
-            user_input["openstack_#{c}"] = thor.ask("openstack #{c}:")
-            user_input
-          end
-
-          thor.say("Configure Complete!", :blue) if open(File.expand_path("~/.fog"), "w") do |e|
-            YAML.dump({ "default" => params }, e)
-          end
-        end
+      def show_env_setting
+          thor = Thor.new
+          thor.say("please set env this paramater", :yellow)
+          puts " export OS_AUTH_URL=http://your_keystone_server:port/v2.0"
+          puts " export OS_USERNAME=your name"
+          puts " export OS_PASSWORD=your password"
       end
     end
   end

data/lib/pec/sample.rb

@@ -8,10 +8,12 @@ module Pec
               "tenant" =>  "your_tenant",
               "image" =>  "centos-7",
               "flavor" =>  "m1.small",
+              "allowed_address_pairs" => "nova",
               "networks" => {
                 "eth0" => {
                   "bootproto" => "static",
                   "ip_address" => "10.0.0.0/24",
+                  "allowed_address_pairs" => ["10.0.0.1"],
                   "gateway" =>  "10.0.0.254",
                   "dns1" => "10.0.0.10"
                 },
@@ -24,7 +26,7 @@ module Pec
               },
               "security_group" => [
                 "default",
-                "www from any"
+                "www_from_any"
               ],
               "templates" => [
                 "web_server.yaml"
@@ -36,6 +38,7 @@ module Pec
             }
           }
         end
+
         def user_data
           {
             "hostname" => "pec",

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/pec.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency 'thor', '~> 0.19.1'
-  spec.add_dependency 'fog', '>= 1.34.0'
+  spec.add_dependency 'yao', '>= 0.0.2'
   spec.add_dependency 'ruby-ip', '~> 0.9.3'
-  spec.add_dependency 'activesupport', '~> 4.2.1'
   spec.add_dependency 'colorator', '~> 0.1'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: yao
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: ruby-ip
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +131,6 @@ files:
 - lib/pec.rb
 - lib/pec/cli.rb
 - lib/pec/configure.rb
-- lib/pec/director.rb
 - lib/pec/handler.rb
 - lib/pec/handler/availability_zone.rb
 - lib/pec/handler/base.rb
@@ -182,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: openstack vm booter.

data/lib/pec/director.rb

@@ -1,111 +0,0 @@
-module Pec
-  class Director
-    def self.make(host_name)
-      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)
-
-        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
-
-      rescue Excon::Errors::Error => e
-        excon_err_message(e)
-      rescue => e
-        Pec::Logger.critical(e)
-    end
-
-    def self.destroy(host_name, options)
-      Pec.configure.each do |host|
-        next if host_name && host.name != host_name
-        Pec.compute.set_tenant(host.tenant)
-        
-        server = Pec.compute.servers.find {|s|s.name == host.name}
-        unless server
-          Pec::Logger.notice "not be created #{host.name}"
-          next
-        end
-        
-        if options[:force] || Thor.new.yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
-          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
-        Pec::Logger.critical(e)
-    end
-
-    def self.status(host_name)
-      Pec.configure.each do |host|
-        next if host_name && host.name != host_name
-        if server = Pec.compute.servers.find {|s|s.name == host.name}
-          puts sprintf(" %-35s %-10s %-10s %-10s %-10s %-35s %-48s",
-            host.name,
-            server.state,
-            Pec.identity.tenants.find_by_id(server.tenant_id),
-            Pec.compute.flavors.get(server.flavor['id']).name,
-            server.availability_zone,
-            server.os_ext_srv_attr_host,
-            server.addresses.map do |ethers|                                                                                                    
-              ethers[1].map do |ether|                                                                                                           
-                ether["addr"]                                                                                                                 
-              end                                                                                                                             
-            end.flatten.join(",")
-          )
-        else
-          puts sprintf(" %-35s %-10s",
-            host.name,
-            "uncreated"
-          )
-        end
-      end
-
-      rescue Excon::Errors::Error => e
-        excon_err_message(e)
-      rescue => e
-        Pec::Logger.critical(e)
-    end
-
-    def self.excon_err_message(e)
-      if e.response
-        JSON.parse(e.response[:body]).each { |e,m| Pec::Logger.critical("#{e}:#{m["message"]}") }
-      else
-        Pec::Logger.critical(e)
-      end
-    end
-  end
-end
-
-module Fog
-  module Network
-    class OpenStack
-      class Real
-        def set_tenant_patch(tenant)
-          @openstack_must_reauthenticate = true
-          @openstack_tenant = tenant.to_s
-          authenticate
-          @path.sub!(/\/$/, '')
-          unless @path.match(SUPPORTED_VERSIONS)
-            @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS,
-                                                               @openstack_management_uri,
-                                                               @auth_token,
-                                                               @connection_options)
-          end
-        end
-      end
-    end
-  end
-end