conoha 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ab3ff94a231bbb1a106e9be65d7b409742c7032
-  data.tar.gz: c24d9fddfbc25952b0032dc2d747edd51a6fc1eb
+  metadata.gz: 151619e4a592951d23e53b1ce1f62226107120f8
+  data.tar.gz: 32f638a9b154a366c300d37d80f15ecfe74e9dc9
 SHA512:
-  metadata.gz: 5d1d48a1c8ebdb485454b41eb9fd54b0e21adc3fa6c67dbf219def62ce836311f56d07b0e0e8339408e5b2d89adcd9b870a2fd4e7ace1afd21f5963a42a7e258
-  data.tar.gz: f7638572a90b3fe49882fd97b3148cddf37e80ef5543e1aec23baa0346dbc30b9832c51db6abe79704bad769bbb8eda7c5768722cbd3d41c843f9f092a9b62b5
+  metadata.gz: 744f04a08ba3d8670fdbb3660a8ca5ceab22a5ff074b93225bdc70638170439fa299c1861f3c449f2dc031b70ba9c826583491d7b41caea8063f09302d4e2a80
+  data.tar.gz: 535a1f635648db1f8ff79a85b40ab64dc2bc4f6ef7e247869b5b4415db384d2c3063047ce4b74410718cd3d40f26f595a4b421ef4216950f033cfd44d50f8f35

data/.travis.yml

@@ -3,4 +3,4 @@ rvm:
   - 2.2.3
   - 2.3.0
   - 2.3.1
-before_install: gem install bundler -v 1.11.2
+before_install: gem install bundler -v 1.12.5

data/README.md

@@ -171,6 +171,51 @@ conoharant shutdown
 conoharant destroy
 ```
 
+## Experimental feature: multiple accounts management
+
+Edit `~/.conoha-config.json` like following:
+
+```sh
+{
+  "username": "gncu123456789",
+  "password": "your-password",
+  "tenant_id": "0123456789abcdef",
+  "public_key": "your-registered-public-key-name",
+  "accounts": {
+    "user1": {
+      "username": "gncu123456789",
+      "password": "your-password",
+      "tenant_id": "0123456789abcdef",
+      "public_key": "your-registered-public-key-name"
+    },
+    "user2": {
+      "username": "gncu123456790",
+      "password": "your-user2-password",
+      "tenant_id": "0123456789abcdf0",
+      "public_key": "your-registered-public-key-name"
+    }
+  }
+}
+```
+
+```sh
+conoha authenticate user1
+
+conoha whoami
+#=> user1
+
+conoha create ubuntu g-1gb
+# Create VM of user1
+
+conoha authenticate user2
+
+conoha whoami
+#=> user2
+
+conoha create ubuntu g-1gb
+# Create VM of user2
+```
+
 ## License
 
 [MIT](LICENSE.txt)

data/exe/conoha

@@ -35,13 +35,32 @@ when 'version', '--version', '-v'
   puts ConohaVersion::ITSELF
 when 'authenticate'
   begin
-    Conoha.authenticate!
+    if ARGV.size == 0
+      Conoha.authenticate!
+    else
+      Conoha.authenticate_user! ARGV.first
+    end
   rescue => e
+    STDERR.puts e
     STDERR.puts "Failed to authenticate."
     STDERR.puts "Retry after modifying \"~/.conoha-config.json\"."
     exit 1
   end
   puts 'Succeeded!'
+when 'whoami'
+  result = Conoha.whoami
+  if result.class == Fixnum
+    case result
+    when 1
+      puts "\"accounts\" doesn't exist in \"~/.conoha-config.json\"."
+    when 2
+      puts "\"accounts\" doesn't have \"#{Conoha.username}\"."
+    else
+      puts "fixnum else"
+    end
+  else
+    puts result
+  end
 when 'vpslist'
   pp Conoha.vps_list
 when 'status'

data/lib/conoha.rb

@@ -26,6 +26,57 @@ class Conoha
     save_config!
   end
 
+  def self.authenticate_user!(user_id)
+    uri = 'https://identity.tyo1.conoha.io/v2.0/tokens'
+
+    credential = @@accounts[user_id]
+    if credential.nil?
+      raise StandardError.new "User \"#{user_id}\" doesn't exist."
+    end
+
+    payload = {
+        auth: {
+          passwordCredentials: {
+            username: credential['username'],
+            password: credential['password']
+          },
+          tenantId: credential['tenant_id']
+        }
+      }
+    res = https_post uri, payload, nil
+    if res.code == '401'
+      raise StandardError.new 'Authentication failure'
+    end
+
+    @@username = credential['username']
+    @@password = credential['password']
+    @@tenant_id = credential['tenant_id']
+    @@public_key = credential['public_key']
+    @@authtoken = JSON.parse(res.body)["access"]["token"]["id"]
+    save_config!
+  end
+
+  def self.username
+    @@username
+  end
+
+  # @return [Fixnum|String]
+  #   Fixnum:
+  #     1: conoha-config.json doesn't have "accounts" key
+  #     2: "accounts" doesn't have deafult "username"
+  #   String: "id" of "accounts".
+  def self.whoami
+    if @@accounts.nil?
+      1
+    else
+      if result = @@accounts.find { |k, v| v['username'] == @@username }
+        result.first
+      else
+        2
+      end
+    end
+  end
+
   def self.servers
     uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
     res = https_get uri, authtoken
@@ -36,12 +87,16 @@ class Conoha
     servers.map { |e| e["id"] }
   end
 
+  # @raise [StandardError]
+  #   when "os" doesn't exist in image_tag_dictionary
+  #   when "image_tag" doesn't exist in images
   def self.create(os, ram)
+    image_ref = image_ref_from_image_tag(image_tag_dictionary(os))
     uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
     payload = {
       server: {
         adminPass: randstr,
-        imageRef: image_ref_from_os(os),
+        imageRef: image_ref,
         flavorRef: flavor_ref(ram),
         key_name: public_key,
         security_groups: [{name: 'default'}, {name: 'gncs-ipv4-all'}],
@@ -52,10 +107,11 @@ class Conoha
   end
 
   def self.rebuild(server_id, os)
+    image_ref_from_image_tag(image_tag_dictionary(os))
     uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
     payload = {
       rebuild: {
-        imageRef: image_ref_from_os(os),
+        imageRef: image_ref,
         adminPass: randstr,
         key_name: public_key
       }
@@ -167,6 +223,7 @@ EOS
       @@tenant_id = config["tenant_id"]
       @@public_key = config["public_key"]
       @@authtoken = config["authtoken"]
+      @@accounts = config["accounts"]
       @@config_loaded = true
     end
   end
@@ -178,6 +235,7 @@ EOS
       tenant_id: @@tenant_id,
       public_key: @@public_key,
       authtoken: @@authtoken,
+      accounts: @@accounts
     })
     File.open(config_file_path, 'w') do |f|
       f.write s
@@ -196,6 +254,17 @@ EOS
     @@public_key
   end
 
+  # @return [String] server ID (UUID)
+  # @param [String] image_tag e.g. "vmi-centos-7-amd64"
+  # @raise [StandardError] when image_tag doesn't exist in images
+  def self.image_ref_from_image_tag(image_tag)
+    if image = images.find { |e| e[0] == image_tag }
+      image[1]
+    else
+      raise StandardError.new "Tag \"#{tag}\" doesn't exist in image list."
+    end
+  end
+
   def self.flavor_ref(ram)
     dictionary = {
       'g-1gb'  => '7eea7469-0d85-4f82-8050-6ae742394681',

data/lib/conoha/util.rb

@@ -61,30 +61,6 @@ def ipv4(ip_address)
   ip_address.select { |e| e =~ /\d+\.\d+\.\d+\.\d+/ }.first
 end
 
-# @return [String] UUID of image
-# @params [String] os OS name
-# @raise [StandardError] When the OS name isn't contained.
-def image_ref_from_os(os)
-  dictionary = {
-    'ubuntu'   => '793be3e1-3c33-4ab3-9779-f4098ea90eb5', # Ubuntu 14.04 amd64
-    'debian'   => 'c14d5dd5-debc-464c-9cc3-ada6e48f5d0c', # Debian 8 amd64
-    'fedora23' => 'ed6364b8-9fb2-479c-a5a8-bde9ba1101f3', # Fedora 23 amd64
-    'centos67' => 'cd13a8b9-6b57-467b-932e-eee5edcd8d6c', # CentOS 6.7
-    'centos72' => 'e141fc06-632e-42a9-9c2d-eec9201427ec', # CentOS 7.2
-    'arch'     => 'f5e5b475-ebec-4973-99c7-bc8add5d16c4', # Arch
-  }
-  if dictionary.keys.include? os
-    dictionary[os]
-  else
-    raise StandardError.new <<EOS
-"#{os}" doesn't exist.
-Select os name from the following list:
-
-#{dictionary.keys.join("\n")}
-EOS
-  end
-end
-
 # @return [String] Image name tag
 # @params [String] os OS name
 # @raise [StandardError] When the OS name isn't included in the dictionary.
@@ -96,17 +72,17 @@ def image_tag_dictionary(os)
     'centos67' => 'vmi-centos-6.7-amd64', # CentOS 6.7
     'centos72' => 'vmi-centos-7.2-amd64', # CentOS 7.2
     'arch'     => 'vmi-arch-amd64', # Arch
+    'opensuse' => 'vmi-opensuse-42.1-amd64', # openSUSE
+    'openbsd'  => 'vmi-openbsd-5.8-amd64', # OpenBSD
+    'netbsd'   => 'vmi-netbsd-7.0-amd64', # NetBSD
+    'freebsd'  => 'vmi-freebsd-10.1-x86_64', # FreeBSD
   }
 
-  # 'opensuse' => 'vmi-opensuse-42.1-amd64' # openSUSE
-  # 'openbsd'  => 'vmi-openbsd-5.8-amd64', # OpenBSD
-  # 'netbsd'   => 'vmi-netbsd-7.0-amd64', # NetBSD
-  # 'freebsd'  => 'vmi-freebsd-10.1-x86_64', # FreeBSD
-
   if dictionary.keys.include? os
     dictionary[os]
   else
     raise StandardError.new <<EOS
+"#{os}" doesn't exist.
 Select os name from the following list:
 
 #{dictionary.keys.join("\n")}

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.7.2"
+  ITSELF = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler