didata_cloud_sdk 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09bfcaf3290960d982e1ce9be7491bcad842eb37
-  data.tar.gz: 253cb39dd854f027b2cdddf031998dc8911a340c
+  metadata.gz: bea28e11f44f4c085361fd7a23731036fe57c38d
+  data.tar.gz: faf096072e454843070199f7ed9acb60d585718d
 SHA512:
-  metadata.gz: ea2654971386c74802c6ce37fa38591399d50cdfdb93a4e992ff79a08dfe02eb8e52bbb2c04fdbe8e3f03b847f8bb4338c8396b4d1d1e09373318d08911f7c15
-  data.tar.gz: d0d71103156edfc84f510a9fb0063c23588b49675ef7217c132618504c4e7b18cf4a6fcd8f6f0fae5bfca61e9c01400a0fdac6b83d51e94f2a6187a292318960
+  metadata.gz: 8e3dd238b33ddef888105e77fb5924a7619f0e898beb4ac58138a686fe2619d8a1dce24141b9a729f462304f36ad137a435cad6f84a92e7fcaa4f35a5dbe01b2
+  data.tar.gz: e7854665565e3a0b294a3eb9342ab83c47a288f80f2c87a877fff8f6a274ce4ffc918d39bd1172f37734d581fac61825d459e4994e7679b56df09b6b82c5a3d4

data/README.md

@@ -22,7 +22,7 @@ require 'ddcloud.rb'
 
 ```
 require "ddcloud"
-api_base      = "https://cloudapi.nttamerica.com/oec/0.9"
+api_base      = DDcloud::Client::API_URL[:eu]
 dev_org_id    = 'my-super-secret-org-numbersandletters'
 dev_user      = 'me'
 dev_password  = 'very secret'
@@ -35,6 +35,9 @@ pp c.server.show_with_disks(server.network_id, server.id)
 
 ### Examples
 
+See ```/examples``` for more examples.
+
+
 ```
 #create a new network
 c.network.create("network-name", "description", "EU1")

data/examples/list_networks.rb

@@ -9,6 +9,8 @@ require "./credentials.rb"
 require "./util.rb"
 
 
-c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+c = DDcloud::Client.new DDcloud::Client::API_URL[:eu], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+
+puts DDcloud::Client::API_URL[:eu]
 
 pp c.network.list

data/examples/make_servers_in_new_network.rb

@@ -8,6 +8,9 @@ require "optparse"
 require "./credentials.rb"
 
 def diff_id_hashes(h1, h2)
+	puts "in diff"
+	pp h1
+	pp h2
 	a1 = h1.map { |e| e[:id] }
 	a2 = h2.map { |e| e[:id] }
 	a2 - a1
@@ -15,7 +18,7 @@ end
 
 def block_until_server_normal(c, name)
 	while true do
-		if c.server.list(name: name)[:state] == "NORMAL"
+		if((not c.server.list(name: name).empty?) && (c.server.list(name: name)[:state] == "NORMAL"))
 			break
 		end
 		sleep 1
@@ -60,7 +63,7 @@ c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[
 c.network.create options[:name], "Automatically generated network"
 
 network_id = c.network.show_by_name(options[:name])[:id]
-image_id = "d4ed6d40-e2f0-11e2-84e5-180373fb68df" #default image id
+image_id = DDcloud::Client::IMAGES[:ubuntu_14_04] #image id for ubuntu 14.04
 
 
 before = c.server.list(network_id: network_id)

data/examples/make_servers_in_new_network2.rb

@@ -0,0 +1,87 @@
+
+
+
+require "ddcloud"
+require "pp"
+require "optparse"
+
+require "./credentials.rb"
+
+def diff_id_hashes(h1, h2)
+	a1 = h1.map { |e| e[:id] }
+	a2 = h2.map { |e| e[:id] }
+	a2 - a1
+end
+
+def block_until_server_normal(c, name)
+	while true do
+		if c.server.list(name: name)[:state] == "NORMAL"
+			break
+		end
+		sleep 1
+	end
+end
+
+def log(string)
+	time = DateTime.now.strftime("%H:%M")
+	puts "#{time} -> #{string}"
+end
+
+options = {}
+
+OptionParser.new do |opts|
+	opts.banner = "Usage: example.rb [options]"
+
+	opts.on("-n", "--number NUMBER", "Number of hosts") do |n|
+		options[:number] = n.to_i
+	end
+	opts.on("-a", "--network_name name", "Name of the network to be created") do |n|
+		options[:name] = n
+	end
+	opts.on_tail("-h", "--help", "Show this message") do
+		puts opts
+		exit
+	end
+end.parse!
+
+if not options[:number]
+	puts "Please specify the number of machines to create with -n"
+	puts "For help, use -h"
+	exit
+end
+if not options[:name]
+	puts "Please specify the network name with -a"
+	puts "For help, use -h"
+	exit
+end
+
+c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+
+c.network.create options[:name], "Automatically generated network"
+
+network_id = c.network.show_by_name(options[:name])[:id]
+image_id = "d4ed6d40-e2f0-11e2-84e5-180373fb68df" #default image id
+
+
+before = c.server.list(network_id: network_id)
+c.server.create "jumphost", "Automatically generated server", network_id, image_id
+(1...options[:number]).each do |n|
+	c.server.create "autoserver-#{n+1}", "Automatically generated server", network_id, image_id
+end
+(1...options[:number]).each do |n|
+	block_until_server_normal c, "autoserver-#{n+1}"
+	log "autoserver-#{n+1} started"
+end
+after = c.server.list(network_id: network_id)
+created_servers = diff_id_hashes(before, after)
+log "Created: #{created_servers.to_s}"
+
+#create acl rule
+c.network.aclrule_create(network_id, "allow ssh", 112, true, "TCP", 22, true)
+
+#nat the servers so we can make our changes
+server = created_servers[0]
+details = after.select { |a| a["id"] == server }
+details = details[0]
+log details.to_s
+c.network.natrule_create(network_id, details[:name], details[:private_ip])

data/examples/remove_server_from_server_farm.rb

@@ -0,0 +1,69 @@
+
+require "ddcloud"
+require "pp"
+require "optparse"
+
+require "./credentials.rb"
+
+def diff_id_hashes(h1, h2)
+	a1 = h1.map { |e| e[:id] }
+	a2 = h2.map { |e| e[:id] }
+	a2 - a1
+end
+
+def block_until_server_normal(c, name)
+	while true do
+		if c.server.list(name: name)[:state] == "NORMAL"
+			break
+		end
+		sleep 1
+	end
+end
+
+def log(string)
+	time = DateTime.now.strftime("%H:%M")
+	puts "#{time} -> #{string}"
+end
+
+
+
+c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+
+network_id = "8a55ac56-2821-11e1-ada2-180373fb68df"
+farm_id = "8b4eaa29-b290-4771-96f0-b9c79596bc44"
+
+
+log "server farm list"
+pp c.vip.server_farm_list network_id
+
+log "server farm details"
+real_servers = c.vip.server_farm_details network_id, farm_id
+
+pp real_servers
+log "server farm real server details"
+pp real_servers[:real_server]
+if real_servers[:real_server].length > 1 && real_servers[:real_server].kind_of?(Array)
+	host = real_servers[:real_server][0]
+
+	list_real_servers = c.vip.real_servers_list network_id
+
+	server_id = ""
+	real_server_id = host[:id]
+	pp real_server_id
+	list_real_servers.each do |real_server|
+		if real_server[:id] == real_server_id
+			server_id = real_server[:server_id]
+		end
+	end
+
+	pp server_id
+
+	puts "----removing from the server farm----"
+	pp c.vip.real_server_from_server_farm network_id, farm_id, real_server_id, 80
+	puts "----shutting down server----"
+	pp c.server.shutdown server_id
+else
+	log "no more servers to remove"
+end
+
+

data/examples/start_and_add_server_to_server_farm.rb

@@ -0,0 +1,73 @@
+
+require "ddcloud"
+require "pp"
+require "optparse"
+
+require "./credentials.rb"
+
+def diff_id_hashes(h1, h2)
+	a1 = h1.map { |e| e[:id] }
+	a2 = h2.map { |e| e[:id] }
+	a2 - a1
+end
+
+def block_until_server_normal(c, name, network_id)
+	while true do
+		if c.server.list(name: name, network_id: network_id)[:state] == "NORMAL"
+			break
+		end
+		sleep 1
+	end
+end
+
+def log(string)
+	time = DateTime.now.strftime("%H:%M")
+	puts "#{time} -> #{string}"
+end
+
+
+
+c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+
+network_id = "8a55ac56-2821-11e1-ada2-180373fb68df"
+farm_id = "8b4eaa29-b290-4771-96f0-b9c79596bc44"
+
+
+pp c.vip.server_farm_list network_id
+
+real_servers = c.vip.server_farm_details network_id, farm_id
+
+pp real_servers
+pp real_servers[:real_server]
+pp real_servers[:real_server].length
+if real_servers[:real_server].length < 5 || (not real_servers[:real_server].kind_of?(Array))
+
+	list_real_servers = c.vip.real_servers_list network_id
+
+	server_id = ""
+	real_server_id = ""
+	pp real_server_id
+	list_real_servers.each do |real_server|
+		pp real_server
+		real_server_id = real_server[:id]
+		server =  c.server.show( real_server[:server_id])
+		if server[:is_started] == "false"
+			#start the server
+			log "---- starting server #{server[:name]} ----"
+			pp c.server.start server[:id]
+			block_until_server_normal(c, server[:name], network_id)
+
+			log "---- adding server to server farm ----"
+			pp c.vip.real_server_to_server_farm network_id, farm_id, real_server_id, 80
+
+			log("done")
+
+			exit
+		end
+	end
+
+else
+	log "We don't have any more servers in our farm"
+end
+
+

data/lib/ddcloud/client.rb

@@ -16,6 +16,8 @@ module DDcloud
     attr_accessor :silent, :colors # log setting
     attr_accessor :page_size, :page_number, :order_by, :filter_with
 
+    IMAGES = {suse_ent_64: "d4edfe22-e2f0-11e2-84e5-180373fb68df", ubuntu_14_04: "abef3a94-3361-4ce4-a937-5e587042586a", ubuntu_12_04: "d4ed6d40-e2f0-11e2-84e5-180373fb68df", ubuntu_10_04: "d4edba02-e2f0-11e2-84e5-180373fb68df"}
+    API_URL = {na: "https://api-na.dimensiondata.com/oec/0.9", eu: "https://api-eu.dimensiondata.com/oec/0.9", au: "https://api-au.dimensiondata.com/oec/0.9", mea: "https://api-mea.dimensiondata.com/oec/0.9", ap: "https://api-ap.dimensiondata.com/oec/0.9"}
 
 
     def initialize(api_base, org_id, username, password, default_password="verysecurepassword", datacenter="EU1", colors = true, silent = true)

data/lib/ddcloud/version.rb

@@ -1,5 +1,5 @@
 module DDcloud
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 
   {"xmlns:ns3"=>"http://oec.api.opsource.net/schemas/organization",
     "xmlns:ns4"=>"http://oec.api.opsource.net/schemas/network",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: didata_cloud_sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Juozas Gaigalas
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: SDK to access Dimension Data Cloud api'
@@ -105,7 +105,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -121,7 +121,10 @@ files:
 - examples/list_networks.rb
 - examples/list_servers_in_network.rb
 - examples/make_servers_in_new_network.rb
+- examples/make_servers_in_new_network2.rb
+- examples/remove_server_from_server_farm.rb
 - examples/start_all_servers_in_network.rb
+- examples/start_and_add_server_to_server_farm.rb
 - examples/util.rb
 - lib/ddcloud.rb
 - lib/ddcloud/api/account.rb
@@ -148,17 +151,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ddcloud
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Dimension Data REST API client gem