pec 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12573783d7f7d2956311eac8ddafc10dd576ef54
-  data.tar.gz: c995f4586be47905890d741abe3c419733deff28
+  metadata.gz: 3777a334f52b99460286a3728200d1115a9912cb
+  data.tar.gz: a77aa53e221c37903bb3e20c91eefd6a5d139d54
 SHA512:
-  metadata.gz: 532ce626a2742c53c8cd53869141b66b7cb455112a2a74a4e8b1208dac528512727aacbd696dede2975d7e0cf590b104a330824c2541b62853dceafc6a6465db
-  data.tar.gz: 912b3adf04d3d12b5d36cc5a0f4a410827bdbfb33a414f4f554287807b4ba0d68462847e0f591be05d8ab048c932f8b4ec47a8fa89a57e1ee1bfb474d8e18e9a
+  metadata.gz: 553934f57c16268267a986f769650a7429ba59aa49b4fe0b20573fad64250b82b28890988a03ffb6250c86e2c6d560c65ac59863f597c2013439c6fe083c02c3
+  data.tar.gz: b09690c07338509b24963ac254161adda7e548b0808f05293ff5849b49f9947b95536e542b29e131137a0bec4e49ecb431be3749c479d4bfba6f15727dcaf935

data/Gemfile

@@ -7,7 +7,7 @@ gem 'thor'
 gem 'ruby-ip'
 gem 'activesupport'
 gem "bundler"
-
+gem "colorator"
 group :development, :test do
   gem "rspec"
   gem "rake"

data/README.md

@@ -13,7 +13,7 @@ OpenStackにおいて複数サーバの起動一括起動停止や、 DHCPサー
 
 ## Usage
 
-定義ファイル作成
+セットアップ・定義ファイル作成
 
     $ pec init
 
@@ -21,7 +21,7 @@ OpenStackにおいて複数サーバの起動一括起動停止や、 DHCPサー
 create - /Pec.yaml
 create - /user_datas/web_server.yaml.sample
 ```
-        
+
 Pec.yamlに基づきホストを作成します。
 ホスト名が指定された場合はそのホストのみ作成、削除します。
 
@@ -29,21 +29,13 @@ Pec.yamlに基づきホストを作成します。
 
     $ pec destroy <hostname>
 
-### Configure
-#### ~/.fog
-```
-% cat ~/.fog
-default:
-  openstack_auth_url: "http://your-openstack-endpoint/v2.0/tokens"
-  openstack_username: "admin"
-  openstack_tenant: "admin"
-  openstack_api_key: "admin-no-password"
-```
-
+    $ pec status <hostname>
 
+### Configure
 #### Pec.yaml
 ```
 pyama-test001:
+  tenant: your_tenant
   image: centos-7.1_chef-12.3_puppet-3.7
   flavor: m1.small
   networks:
@@ -75,10 +67,11 @@ pyama-test002:
 
 | 項目名         | 説明                                           | 必須 | 例示                            |
 | -------------- | ---------------------------------------------- | ---- | ------------------------------- |
-| instance_name| インスタンス名                                              | ○    | pyama-test001                   |
+| instance_name  | インスタンス名                                 | ○    | pyama-test001                   |
+| tenant         | テナント名                                     | ○    | your_tenant                     |
 | image          | イメージ名                                     | ○    | centos-7.1_chef-12.3_puppet-3.7 |
 | flavor         | フレーバー名                                   | ○    | m1.small                        |
-| networks       | ネットワーク定義                               | -    | []                            |
+| networks       | ネットワーク定義                               | -    | []                              |
 | security_group | セキュリティグループ名                         | -    | [default,ssh]                   |
 | templates      | `user_data`のテンプレート.`./user_datas`に配置 | -    | [base.yaml,webserver.yaml]      |
 | user_data      | cloud-init記法に準拠                           | -    | -                               |

data/lib/pec.rb

@@ -1,9 +1,17 @@
 require 'fog'
 require 'ip'
+require 'colorator'
 require "pec/version"
 require "pec/query"
 require "pec/errors"
-require "pec/vm_director"
+require "pec/init"
+require "pec/resource"
+require "pec/resource/openstack"
+require "pec/director"
+require "pec/director/helper"
+require "pec/director/make_director"
+require "pec/director/destroy_director"
+require "pec/director/vm_status_director"
 require "pec/configure"
 require "pec/configure/sample"
 require "pec/configure/host"
@@ -12,6 +20,7 @@ require "pec/configure/user_data"
 require "pec/compute/server"
 require "pec/compute/flavor"
 require "pec/compute/image"
+require "pec/compute/tenant"
 require "pec/compute/security_group"
 require "pec/network/port"
 require "pec/network/subnet"

data/lib/pec/cli.rb

@@ -5,84 +5,26 @@ module Pec
 
     desc 'init', 'create sample config'
     def init
-      dirname = "user_datas"
-      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)
-
+      Pec::Init.create_fog_config
+      Pec::Init.create_template_dir
+      Pec::Init.create_sample_config
     end
 
     desc 'up', 'create vm by Pec.yaml'
     def up(host_name = nil)
-      config = Pec::Configure.new("Pec.yaml")
-      director = Pec::VmDirector.new
-
-      config.filter_by_host(host_name).each do |host|
-        begin
-          director.make(host)
-        rescue Pec::Errors::Error => e
-          pec_create_err_message(e, host)
-        rescue Excon::Errors::Error => e
-          excon_err_message(e)
-        end
-      end if config
-      rescue Errno::ENOENT => e
-        puts e
-      rescue Pec::Errors::Configure => e
-        pec_config_err_message
+      Pec::Director.execute("make", host_name)
     end
 
     option :force , type: :boolean, aliases: "-f"
     desc "destroy", "delete vm"
     def destroy(host_name = nil)
-      config = Pec::Configure.new("Pec.yaml")
-      director = Pec::VmDirector.new
-
-      config.filter_by_host(host_name).each do |host|
-        begin
-          if options[:force] || yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
-            director.destroy!(host.name)
-          end
-        rescue Pec::Errors::Error => e
-          pec_delete_err_message(e, host)
-        rescue Excon::Errors::Error => e
-          excon_err_message(e)
-        end
-      end if config
-      rescue Errno::ENOENT => e
-        puts e
-      rescue Pec::Errors::Configure => e
-        pec_config_err_message
+      Pec::Director.execute("destroy", host_name, options)
     end
 
-    no_tasks do
-      def pec_create_err_message(e, host)
-          puts e
-          puts "can't create server:#{host.name}"
-      end
-
-      def pec_delete_err_message(e, host)
-          puts e
-          puts "can't create server:#{host.name}"
-      end
-
-      def pec_config_err_message
-        puts "configure can't load"
-      end
-
-      def excon_err_message(e)
-          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}" }
-      end
+    desc "status", "vm status"
+    def status(host_name = nil)
+      say("Current machine stasus:", :yellow)
+      Pec::Director.execute("vm_status", host_name)
     end
   end
 end

data/lib/pec/compute/flavor.rb

@@ -1,7 +1,7 @@
 module Pec
   class Compute
     class Flavor
-      include Query
+      extend Query
     end
   end
 end

data/lib/pec/compute/image.rb

@@ -1,7 +1,7 @@
 module Pec
   class Compute
     class Image
-      include Query
+      extend Query
     end
   end
 end

data/lib/pec/compute/security_group.rb

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

data/lib/pec/compute/server.rb

@@ -1,37 +1,31 @@
-require 'json'
 module Pec
   class Compute
     class Server
-      include Query
-      def create(name, image_ref, flavor_ref, ports, options)
-        networks = ports.map do |port|
-          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
+      extend Query
+      class << self
+        def create(name, image_ref, flavor_ref, options)
 
-        options.merge!({ 'nics' =>  networks })
+          response = Pec::Resource.get.create_server(name, image_ref, flavor_ref, options)
 
-        response = Fog::Compute[:openstack].create_server(name, image_ref, flavor_ref, options)
+          if response[:status] == 202
+            puts "success create for server_name:#{name}".blue
+          end
 
-        if response[:status] == 202
-          puts "success create for server_name:#{name}"
+          response.data[:body]["server"]["id"]
         end
 
-        response.data[:body]["server"]["id"]
-      end
-
-      def exists?(server_name)
-        fetch(server_name)
-      end
+        def exists?(server_name)
+          fetch(server_name)
+        end
 
-      def destroy!(server_name)
-        server = fetch(server_name)
-        raise(Pec::Errors::Host, "server_name:#{server_name} is not fond!") unless server
-        response = Fog::Compute[:openstack].delete_server(server["id"]) if server
+        def destroy!(server_name)
+          server = fetch(server_name)
+          raise(Pec::Errors::Host, "server_name:#{server_name} is not fond!") unless server
+          response = Pec::Resource.get.delete_server(server["id"]) if server
 
-        if response && response[:status] == 204
-          puts "server_name:#{server_name} is deleted!"
+          if response && response[:status] == 204
+            puts "server_name:#{server_name} is deleted!".green
+          end
         end
       end
     end

data/lib/pec/compute/tenant.rb

@@ -0,0 +1,12 @@
+module Pec
+  class Compute
+    class Tenant
+      extend Query
+      class << self
+        def get_name(id)
+          list.find {|p| p["id"] == id }["name"]
+        end
+      end
+    end
+  end
+end

data/lib/pec/configure/host.rb

@@ -1,7 +1,7 @@
 module Pec
   class Configure
     class Host
-      attr_reader :name, :image, :flavor,:security_group, :user_data, :networks, :templates
+      attr_reader :name, :image, :flavor,:security_group, :user_data, :networks, :templates, :tenant
       def initialize(config)
         @name = config[0];
         @image = config[1]["image"];
@@ -9,6 +9,7 @@ module Pec
         @security_group = config[1]["security_group"];
         @user_data = config[1]["user_data"];
         @templates = config[1]["templates"]
+        @tenant = config[1]["tenant"]
       end
 
       def append_network(network)
@@ -27,7 +28,7 @@ module Pec
         end
 
         def check_require_key(config)
-          err = %w(image flavor).find {|r| !config[1].key?(r) || config[1][r].nil? }
+          err = %w(image flavor tenant).find {|r| !config[1].key?(r) || config[1][r].nil? }
           raise(Pec::Errors::Host,"skip! #{config[0]}: #{err} is required!") unless  err.nil?
           true
         end

data/lib/pec/configure/sample.rb

@@ -5,6 +5,7 @@ module Pec
         def pec_file
           {
             "sever_name" => {
+              "tenant" =>  "your_tenant",
               "image" =>  "centos-7",
               "flavor" =>  "m1.small",
               "networks" => [

data/lib/pec/configure/user_data.rb

@@ -21,7 +21,6 @@ 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

data/lib/pec/director.rb

@@ -0,0 +1,53 @@
+module Pec
+class Director
+    class << self
+
+      def execute(action, host_name, options=nil)
+        config = Pec::Configure.new("Pec.yaml")
+        director = assign_director(action, options)
+
+        config.filter_by_host(host_name).each do |host|
+          begin
+            director.execute!(host) if director.do_it?(host)
+          rescue Pec::Errors::Error => e
+            director.err_message(e, host)
+          rescue Excon::Errors::Error => e
+            excon_err_message(e)
+          end
+        end if config
+
+        rescue Pec::Errors::Configure => e
+          config_load_err_message
+        rescue Pec::Errors::Error => e
+          err_message(e)
+        rescue Errno::ENOENT => e
+          err_messag(e)
+      end
+
+      def assign_director(action, options)
+        case
+        when action == "make"
+          Pec::Director::MakeDirector.new
+        when action == "destroy"
+          Pec::Director::DestroyDirector.new(options)
+        when action == "vm_status"
+          Pec::Director::VmStatusDirector.new
+        else
+          raise
+        end
+      end
+
+      def err_message(e)
+        puts e.to_s.magenta
+      end
+
+      def config_load_err_message
+        puts "can't load configfile".magenta
+      end
+
+      def excon_err_message(e)
+          JSON.parse(e.response[:body]).each { |e,m| puts "#{e}:#{m["message"]}".magenta }
+      end
+    end
+  end
+end

data/lib/pec/director/destroy_director.rb

@@ -0,0 +1,23 @@
+module Pec
+  class Director
+    class DestroyDirector
+      def initialize(command_options)
+        @command_options = command_options
+      end
+
+      def execute!(host)
+        Pec::Resource.set_tenant(host.tenant)
+        Pec::Compute::Server.destroy!(host.name)
+      end
+
+      def do_it?(host)
+        @command_options[:force] || Thor.new.yes?("#{host.name}: Are you sure you want to destroy the '#{host.name}' VM? [y/N]")
+      end
+
+      def err_message(e, host)
+          puts e.to_s.magenta
+          puts "can't destroy server:#{host.name}".magenta if host
+      end
+    end
+  end
+end

data/lib/pec/director/helper.rb

@@ -0,0 +1,47 @@
+module Pec
+  class Director
+    class Helper
+      class << self
+
+        def ports_assign(host)
+          host.networks.map do |ether|
+            begin
+              ip = IP.new(ether.ip_address)
+            rescue ArgumentError => e
+              raise(Pec::Errors::Port, "ip:#{ether.ip_address} #{e}")
+            end
+
+            port_subnet = Pec::Network::Subnet.fetch(ip.network.to_s)
+            raise(Pec::Errors::Subnet, "subnet:#{ip.network.to_s} is not fond!") unless port_subnet
+
+            port = Pec::Network::Port.new.assign(ether.name, ip, port_subnet, get_security_group_id(host.security_group))
+            raise(Pec::Errors::Port, "ip addess:#{ip.to_addr} can't create port!") unless port
+
+            puts "#{host.name}: assingn ip #{port.ip_address}".green
+            port
+          end if host.networks
+        end
+
+        def get_nics(ports)
+          { 'nics' =>  ports.map { |port| { port_id: port.id } }}
+        end
+
+        def get_security_group_id(security_groups)
+          security_groups.map do |sg_name|
+            sg = Pec::Compute::Security_Group.fetch(sg_name)
+            raise(Pec::Errors::SecurityGroup, "security_group:#{sg_name} is not found!") unless sg
+            sg["id"]
+          end if security_groups
+        end
+
+        def parse_from_addresses(addresses)
+          addresses.map do |net, ethers|
+            ethers.map do |ether|
+              ether["addr"]
+            end
+          end.flatten
+        end
+      end
+    end
+  end
+end

data/lib/pec/director/make_director.rb

@@ -0,0 +1,35 @@
+module Pec
+  class Director
+    class MakeDirector
+      def execute!(host)
+        Pec::Resource.set_tenant(host.tenant)
+        make(host)
+      end
+
+      def do_it?(host)
+        true
+      end
+
+      def make(host)
+        if Pec::Compute::Server.exists?(host.name)
+          puts "skip create server! name:#{host.name} is exists!".yellow
+          return true
+        end
+
+        ports      = Pec::Director::Helper.ports_assign(host)
+        flavor_ref = Pec::Compute::Flavor.get_ref(host.flavor)
+        image_ref  = Pec::Compute::Image.get_ref(host.image)
+        options    = { "user_data" => Pec::Configure::UserData.make(host, ports) }
+
+        options.merge!(Pec::Director::Helper.get_nics(ports))
+
+        Pec::Compute::Server.create(host.name, image_ref, flavor_ref, options)
+      end
+
+      def err_message(e, host)
+          puts e.to_s.magenta
+          puts "can't create server:#{host.name}".magenta if host
+      end
+    end
+  end
+end

data/lib/pec/director/vm_status_director.rb

@@ -0,0 +1,38 @@
+module Pec
+  class Director
+    class VmStatusDirector
+      def execute!(host)
+        Pec::Resource.set_tenant(host.tenant)
+        show_summary(host)
+      end
+
+      def do_it?(host)
+        true
+      end
+
+      def show_summary(host)
+        server       = Pec::Compute::Server.fetch(host.name)
+        status       = "uncreated"
+        compute_node = ""
+        tenant_name  = ""
+        flavor       = ""
+        ip_address   = ""
+        if server
+          detail = Pec::Resource.get.get_server_details(server["id"])
+          status = detail["status"] 
+          compute_node = detail["OS-EXT-SRV-ATTR:host"]
+          flavor = detail["flavor"]["id"]
+          tenant_name = Pec::Compute::Tenant.get_name(detail["tenant_id"])
+          ip_address = Pec::Director::Helper.parse_from_addresses(detail["addresses"]).join(",")
+        end
+
+        puts sprintf(" %-30s |%-10s | %-10s | %-10s | %-30s | %-48s", host.name, status, tenant_name, flavor, compute_node, ip_address)
+      end
+
+      def err_message(e, host)
+          puts e.magenta
+          puts "can't create server:#{host.name}".magenta if host
+      end
+    end
+  end
+end

data/lib/pec/errors.rb

@@ -9,5 +9,6 @@ module Pec
     class UserData < Error; end
     class Configure < Error; end
     class SecurityGroup < Error; end
+    class Resource < Error; end
   end
 end

data/lib/pec/init.rb

@@ -0,0 +1,42 @@
+module Pec
+  class Init
+    class << self
+      def create_template_dir
+        dirname = "user_datas"
+        unless FileTest.exist?(dirname)
+          FileUtils.mkdir_p(dirname) 
+          open("#{dirname}/web_server.yaml.sample","w") do |e|
+            YAML.dump(Pec::Configure::Sample.user_data, e)
+          end if FileTest.exist?(dirname)
+          puts "create directry user_datas".green
+        end
+      end
+
+      def create_sample_config
+        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".green
+        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_uri 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
+      end
+    end
+  end
+end

data/lib/pec/network/port.rb

@@ -2,38 +2,59 @@ require 'json'
 module Pec
   class Network
     class Port
-      @@use_ip_list = []
+      extend Query
       attr_reader :name, :subnet
-      include Query
-      def initialize(name, ip_addr, subnet, security_groups)
+      @@use_ip_list = []
+
+      def assign(name, ip, subnet, security_group_ids)
         @name = name
         @subnet = subnet
-        @security_groups = security_groups
-        @config = fetch(ip_addr)
-      end
 
-      def assign!(ip)
         # dhcp ip recycle
         if request_any_address?(ip)
-          @config = fetch_free_port
-          ip = IP.new("#{@config["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") unless @config.nil?
+          @port = fetch_free_port
+          ip = IP.new("#{@port["fixed_ips"][0]["ip_address"]}/#{ip.pfxlen}") unless @port.nil?
         end
-
         case
         when exists? && !used?
-          replace(ip)
+          recreate(ip, subnet, security_group_ids)
         when !exists?
-          create(ip)
+          create(ip, subnet, security_group_ids)
         when used?
           raise(Pec::Errors::Port, "ip:#{ip.to_addr} is used!")
         end
+        self
+      end
+
+      def create(ip, subnet, security_group_ids)
+        options = { security_groups: security_group_ids }
+        options.merge!({ fixed_ips: [{ subnet_id: subnet["id"], ip_address: ip.to_addr}]}) if ip.to_s != subnet["cidr"]
+        response = Pec::Resource.get.create_port(subnet["network_id"], options)
+        if response
+          @port = response.data[:body]["port"] 
+          @@use_ip_list << response.data[:body]["port"]["fixed_ips"][0]["ip_address"]
+          response.data[:body]["port"]["id"]
+        end
+      end
+
+      def delete(ip)
+        target_port = fetch_by_ip(ip.to_addr)
+        response = Pec::Resource.get.delete_port(target_port["id"]) if target_port
+      end
+
+      def recreate(ip, subnet, security_group_ids)
+        create(ip, subnet, security_group_ids) if delete(ip)
       end
 
       def request_any_address?(ip)
         ip.to_s == subnet["cidr"]
       end
 
-      def fetch(ip_addr)
+      def list
+        Pec::Resource.get.port_list
+      end
+
+      def fetch_by_ip(ip_addr)
         list.find {|p| p["fixed_ips"][0]["ip_address"] == ip_addr }
       end
 
@@ -47,52 +68,31 @@ module Pec
       end
 
       def exists?
-        !@config.nil?
+        !@port.nil?
       end
 
       def used?
-        @config && !@config["device_owner"].empty?
+        @port && !@port["device_owner"].empty?
       end
 
       def id
-        @config["id"]
+        @port["id"]
       end
 
       def mac_address
-        @config["mac_address"]
+        @port["mac_address"]
       end
 
       def ip_address
-        @config["fixed_ips"][0]["ip_address"]
+        @port["fixed_ips"][0]["ip_address"]
       end
 
       def network_id
-        @config["network_id"]
+        @port["network_id"]
       end
 
       def netmask
-        IP.new(@config["fixed_ips"][0]["ip_address"]).netmask.to_s
-      end
-
-      def create(ip)
-        options = { security_groups: @security_groups }
-        options.merge!({ fixed_ips: [{ subnet_id: @subnet["id"], ip_address: ip.to_addr}]}) if ip.to_s != subnet["cidr"]
-        response = 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
-      end
-
-      def delete(ip)
-        port = fetch(ip.to_addr)
-        response =  Fog::Network[:openstack].delete_port(port["id"]) if port
-      end
-
-      def replace(ip)
-        create(ip) if delete(ip)
+        IP.new(@port["fixed_ips"][0]["ip_address"]).netmask.to_s
       end
     end
   end

data/lib/pec/network/subnet.rb

@@ -1,11 +1,13 @@
 module Pec
   class Network
     class Subnet
-      include Query
-      def fetch(cidr)
-        subnet = list.find {|p| p["cidr"] == cidr }
-        raise(Pec::Errors::Subnet, "cidr:#{cidr} is not fond!") unless subnet
-        subnet
+      extend Query
+      class << self
+        def fetch(cidr)
+          subnet = list.find {|p| p["cidr"] == cidr }
+          raise(Pec::Errors::Subnet, "cidr:#{cidr} is not fond!") unless subnet
+          subnet
+        end
       end
     end
   end

data/lib/pec/query.rb

@@ -1,22 +1,9 @@
 require 'active_support/core_ext/string/inflections'
-require 'fog'
 module Pec
   module Query
-    def get_adapter
-      case
-      when self.class.name.include?('Network')
-        Fog::Network[:openstack]
-      when self.class.name.include?('Compute')
-        Fog::Compute[:openstack]
-      else
-        raise
-      end
-    end
-
     def list
-      name = self.class.name.demodulize.downcase+"s"
-      @_list ||= Hash.new
-      @_list[name] ||= get_adapter.send("list_#{name}").data[:body][name]
+      class_name = self.name.demodulize.downcase
+      Pec::Resource.get.send("#{class_name}_list")
     end
 
     def fetch(name)

data/lib/pec/resource.rb

@@ -0,0 +1,20 @@
+require 'singleton'
+module Pec
+  class Resource
+    include Singleton
+    class << self
+      @@_resource = {}
+      @@_tenant = nil
+      def get
+        raise(Pec::Errors::Resource, "Please be tenant is always set") unless @@_tenant
+        unless ENV['PEC_TEST']
+          @@_resource[@@_tenant] ||= Pec::Resource::OpenStack.new(@@_tenant)
+        end
+      end
+
+      def set_tenant(tenant)
+        @@_tenant = tenant
+      end
+    end
+  end
+end

data/lib/pec/resource/openstack.rb

@@ -0,0 +1,60 @@
+module Pec
+  class Resource
+    class OpenStack
+      def initialize(tenant)
+        tenant_hash = { openstack_tenant: tenant }
+        @network = Fog::Network::OpenStack.new(tenant_hash)
+        @compute  = Fog::Compute::OpenStack.new(tenant_hash)
+      end
+
+      def port_list
+        @_ports ||= @network.list_ports[:body]['ports']
+      end
+
+      def subnet_list
+        @_subnets ||= @network.list_subnets[:body]['subnets']
+      end
+
+      def server_list
+        @_servers ||= @compute.list_servers[:body]['servers']
+      end
+
+      def security_group_list
+        @_security_groups ||= @compute.list_security_groups[:body]['security_groups']
+      end
+
+      def image_list
+        @_images ||= @compute.list_images[:body]['images']
+      end
+
+      def flavor_list
+        @_flavors ||= @compute.list_flavors[:body]['flavors']
+      end
+
+      def tenant_list
+        @_tenants ||= @compute.list_tenants[:body]['tenants']
+      end
+
+      def create_server(name, image_ref, flavor_ref, options)
+        @compute.create_server(name, image_ref, flavor_ref, options)
+      end
+
+      def delete_server(server_id)
+        @compute.delete_server(server_id)
+      end
+
+      def get_server_details(server_id)
+        @compute.get_server_details(server_id)[:body]['server']
+      end
+
+      def create_port(network_id, options)
+        @network.create_port(network_id, options)
+      end
+
+      def delete_port(port_id)
+        @network.delete_port(port_id)
+      end
+
+    end
+  end
+end

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - kazuhiko yamashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies: []
 description: openstac vm booter.
 email:
@@ -36,17 +36,25 @@ files:
 - lib/pec/compute/image.rb
 - lib/pec/compute/security_group.rb
 - lib/pec/compute/server.rb
+- lib/pec/compute/tenant.rb
 - 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/director.rb
+- lib/pec/director/destroy_director.rb
+- lib/pec/director/helper.rb
+- lib/pec/director/make_director.rb
+- lib/pec/director/vm_status_director.rb
 - lib/pec/errors.rb
+- lib/pec/init.rb
 - lib/pec/network/port.rb
 - lib/pec/network/subnet.rb
 - lib/pec/query.rb
+- lib/pec/resource.rb
+- lib/pec/resource/openstack.rb
 - lib/pec/version.rb
-- lib/pec/vm_director.rb
 - pec.gemspec
 homepage: http://ten-snapon.com
 licenses:

data/lib/pec/vm_director.rb

@@ -1,54 +0,0 @@
-module Pec
-  class VmDirector
-    def initialize
-        @subnet = Pec::Network::Subnet.new
-        @flavor = Pec::Compute::Flavor.new
-        @image = Pec::Compute::Image.new
-        @security_group = Pec::Compute::Security_Group.new
-        @compute = Pec::Compute::Server.new
-    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 = @flavor.get_ref(config.flavor)
-      image_ref = @image.get_ref(config.image)
-      options = { "user_data" => Pec::Configure::UserData.make(config, ports) }
-
-      @compute.create(config.name, image_ref, flavor_ref, ports, options)
-    end
-
-    def destroy!(server_name)
-      @compute.destroy!(host.name)
-    end
-
-    def get_ports(config)
-      config.networks.map do |ether|
-        begin
-          ip = IP.new(ether.ip_address)
-        rescue ArgumentError => e
-          raise(Pec::Errors::Port, "ip:#{ether.ip_address} #{e}")
-        end
-
-        subnet = @subnet.fetch(ip.network.to_s)
-        raise(Pec::Errors::Subnet, "subnet:#{ip.network.to_s} is not fond!") unless subnet
-
-        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)
-      security_groups.map do |name|
-        sg = @security_group.fetch(name)
-        raise(Pec::Errors::SecurityGroup, "security_group:#{name} is not found!") unless sg
-        sg["id"]
-      end if security_groups
-    end
-  end
-end