conoha 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e557cb27ab1ae1f7532872ba763d257bfe27079
-  data.tar.gz: d360ddd0ef2759aaaa9f7d95164e70c461560587
+  metadata.gz: ee13720321ef8d83cb1f53ef211175785b36f3ff
+  data.tar.gz: f46a2cdb58288e4e8c47fe25583a1d4368202c82
 SHA512:
-  metadata.gz: 05a299e26608010374ee15900f3a167a16f5866ef5aa695107e6711ba39e8475328a8eac174a89dfce41589ff0f1214a0eb0f3ccc5e6881f362cbd732ef8382a
-  data.tar.gz: 50ea78edf0182ec6a7e712f5727a613e4c2148dcabf848a5f98db43b2b67f034ecb0d397d98e9cc98b3c9455809643500eddae3b462a7f53690a1445f70eba01
+  metadata.gz: b6ce881814dd2633be87afbf7f462cbb1e3718f692ec85d00b522e0290835efe4d7229a8ebf9897a2af6f36e4713018346e0df6e7a77bf9d3a09d181234c5d86
+  data.tar.gz: 799de61271bdc30083a779154f847469346e7696599378745eb5e5760ad8b1160379a7bd86e26311cb4b36c8cf4667d83e02d7e58bad61219d32f445a26f16f6

data/README.md

@@ -39,11 +39,14 @@ Create `~/.conoha-config.json` like following:
 {
   "username": "gncu123456789",
   "password": "your-password",
+  "region": "tyo1",
   "tenant_id": "0123456789abcdef",
   "public_key": "your-registered-public-key-name"
 }
 ```
 
+You can select a region from `"tyo1"` (Tokyo), `"sin1"` (Singapore) and `"sjc1"` (USA).
+
 You should run `chmod 600 ~/.conoha-config.json`.
 
 ```

data/lib/conoha.rb

@@ -7,8 +7,12 @@ class Conoha
     load_config!
   end
 
+  def self.region
+    @@region || 'tyo1'
+  end
+
   def self.authenticate!
-    uri = 'https://identity.tyo1.conoha.io/v2.0/tokens'
+    uri = "https://identity.#{region}.conoha.io/v2.0/tokens"
     payload = {
         auth: {
           passwordCredentials: {
@@ -27,7 +31,7 @@ class Conoha
   end
 
   def self.authenticate_user!(user_id)
-    uri = 'https://identity.tyo1.conoha.io/v2.0/tokens'
+    uri = "https://identity.#{region}.conoha.io/v2.0/tokens"
 
     credential = @@accounts[user_id]
     if credential.nil?
@@ -78,7 +82,7 @@ class Conoha
   end
 
   def self.servers
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers"
     res = https_get uri, authtoken
     JSON.parse(res.body)["servers"]
   end
@@ -92,7 +96,7 @@ class Conoha
   #   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"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers"
     payload = {
       server: {
         adminPass: randstr,
@@ -108,7 +112,7 @@ class Conoha
 
   def self.rebuild(server_id, os)
     image_ref = image_ref_from_image_tag(image_tag_dictionary(os))
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
     payload = {
       rebuild: {
         imageRef: image_ref,
@@ -121,27 +125,27 @@ class Conoha
   end
 
   def self.delete(server_id)
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
     res = https_delete uri, authtoken
     res.code == '204' ? 'OK' : 'Error'
   end
 
   def self.ip_address_of(server_id)
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
     res = https_get uri, authtoken
     # NOTE: values[1] is needed if eth1 exists.
     JSON.parse(res.body)["server"]["addresses"].values[0].map{ |e| e["addr"] }
   end
 
   def self.status_of(server_id)
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers/#{server_id}"
     res = https_get uri, authtoken
     JSON.parse(res.body)["server"]["status"]
   end
 
   # @param [String] action "os-start" or "os-stop"
   def self.server_action(server_id, action)
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
     res = https_post uri, {action => nil}, authtoken
     res.code == '202' ? 'OK' : 'Error'
   end
@@ -155,25 +159,25 @@ class Conoha
   end
 
   def self.images
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/images"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/images"
     res = https_get uri, authtoken
     JSON.parse(res.body)["images"].map { |e| [e["name"], e["id"]] }
   end
 
   def self.create_image(server_id, name)
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers/#{server_id}/action"
     res = https_post uri, {"createImage" => {"name" => name}}, authtoken
     res.code == '202' ? 'OK' : 'Error'
   end
 
   def self.delete_image(image_ref)
-    uri = "https://image-service.tyo1.conoha.io/v2/images/#{image_ref}"
+    uri = "https://image-service.#{region}.conoha.io/v2/images/#{image_ref}"
     res = https_delete uri, authtoken
     res.code == '204' ? 'OK' : 'Error'
   end
 
   def self.create_from_image(image_ref, ram)
-    uri = "https://compute.tyo1.conoha.io/v2/#{tenant_id}/servers"
+    uri = "https://compute.#{region}.conoha.io/v2/#{tenant_id}/servers"
     payload = {
       server: {
         adminPass: randstr,
@@ -221,6 +225,7 @@ EOS
       config = JSON.parse config_file_string
       @@username = config["username"]
       @@password = config["password"]
+      @@region = config["region"]
       @@tenant_id = config["tenant_id"]
       @@public_key = config["public_key"]
       @@authtoken = config["authtoken"]
@@ -233,6 +238,7 @@ EOS
     s = JSON.generate({
       username: @@username,
       password: @@password,
+      region: @@region,
       tenant_id: @@tenant_id,
       public_key: @@public_key,
       authtoken: @@authtoken,

data/lib/conoha/version.rb

@@ -1,3 +1,3 @@
 module ConohaVersion
-  ITSELF = "0.8.1"
+  ITSELF = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conoha
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - ka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler