didata_cloud_sdk 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa0d979868dddb28db6d03b20bb37af5d460645c
-  data.tar.gz: f7e5101a550d9be5a94c5513a109f1b5d1d177c7
+  metadata.gz: 09bfcaf3290960d982e1ce9be7491bcad842eb37
+  data.tar.gz: 253cb39dd854f027b2cdddf031998dc8911a340c
 SHA512:
-  metadata.gz: 9338df5b87eeb3308381034ac8f0055a40446575c88d68e52097d581880328cb282b1be1524e66a8a45da8aa0ba6fbc64f68d33e178c0effa89dfe8136817795
-  data.tar.gz: 43529b77a8fc7b2ec83fd486d64e4b43185633b59ac660315e50aa349b9d4eb9ab12d371df7a76a069c174728f15468fcc9c54f720e3e8aab5e6736fd117575f
+  metadata.gz: ea2654971386c74802c6ce37fa38591399d50cdfdb93a4e992ff79a08dfe02eb8e52bbb2c04fdbe8e3f03b847f8bb4338c8396b4d1d1e09373318d08911f7c15
+  data.tar.gz: d0d71103156edfc84f510a9fb0063c23588b49675ef7217c132618504c4e7b18cf4a6fcd8f6f0fae5bfca61e9c01400a0fdac6b83d51e94f2a6187a292318960

data/.gitignore

@@ -1,3 +1,5 @@
 Gemfile.lock
 *.swp
 *.gem
+credentials.rb
+

data/README.md

@@ -6,7 +6,7 @@ Dimension Data Cloud API gem designed for easy extensibility.
 
 either install as a gem via Bundler
 ```
-gem install gem install didata_cloud_sdk
+gem install didata_cloud_sdk
 ```
 
 __or__
@@ -14,19 +14,20 @@ __or__
 clone into your project, install gems from `opsource.gemspec` and do:
 
 ```
-$: << 'opsource/lib'
-require 'opsource.rb'
+$: << 'ddcloud/lib'
+require 'ddcloud.rb'
 ```
 
 ### Usage
 
 ```
+require "ddcloud"
 api_base      = "https://cloudapi.nttamerica.com/oec/0.9"
 dev_org_id    = 'my-super-secret-org-numbersandletters'
 dev_user      = 'me'
 dev_password  = 'very secret'
 
-c = Opsource::Client.new(api_base, dev_org_id, dev_user, dev_password)
+c = DDcloud::Client.new(api_base, dev_org_id, dev_user, dev_password)
 
 server = c.server.list(name: 'myfavoritevm')
 pp c.server.show_with_disks(server.network_id, server.id)
@@ -55,13 +56,10 @@ api/vip.rb
 
 See `doc` folder for API info needed for adding you own methods. `api/core.rb` is the plumbing.
 
-See `lib/opsource/api` folder for examples how to add additional endpoints.
+See `lib/ddcloud/api` folder for examples how to add additional endpoints.
 
 Inspired by https://github.com/udayakiran/opsource.
 
-
-
-
 ### TODO
 
 Write some tests. Make pull requests.

data/examples/README.md

@@ -0,0 +1,4 @@
+
+For these examples to work, create a "credentials.rb" file in the same directory.
+
+The file should contain a dictionary variable ```credentials``` with the following fields defined: user, pass, url, org_id

data/examples/list_networks.rb

@@ -0,0 +1,14 @@
+
+
+
+require "ddcloud"
+require "pp"
+require "optparse"
+
+require "./credentials.rb"
+require "./util.rb"
+
+
+c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+
+pp c.network.list

data/examples/list_servers_in_network.rb

@@ -0,0 +1,42 @@
+
+
+
+require "ddcloud"
+require "pp"
+require "optparse"
+
+require "./credentials.rb"
+
+options = {}
+
+OptionParser.new do |opts|
+	opts.banner = "Usage: example.rb [options]"
+
+	opts.on("-n", "--network_name name", "Name of the network") do |n|
+		options[:name] = n
+	end
+	opts.on_tail("-h", "--help", "Show this message") do
+		puts opts
+		exit
+	end
+end.parse!
+
+if not options[:name]
+	puts "Please specify the network name with -n"
+	puts "For help, use -h"
+	exit
+end
+
+c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+
+network = c.network.show_by_name options[:name]
+
+if not network
+	puts "A network with this name does not exist"
+	exit
+end
+
+network_id = network[:id]
+
+pp "servers"
+pp c.server.list(network_id: network_id)

data/examples/make_servers_in_new_network.rb

@@ -0,0 +1,88 @@
+
+
+
+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)
+(0...options[:number]).each do |n|
+	c.server.create "autoserver-#{n+1}", "Automatically generated server", network_id, image_id
+end
+(0...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
+created_servers.each do |server|
+	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])
+
+end

data/examples/start_all_servers_in_network.rb

@@ -0,0 +1,46 @@
+
+
+
+require "ddcloud"
+require "pp"
+require "optparse"
+
+require "./credentials.rb"
+
+options = {}
+
+OptionParser.new do |opts|
+	opts.banner = "Usage: example.rb [options]"
+
+	opts.on("-n", "--network_name name", "Name of the network") do |n|
+		options[:name] = n
+	end
+	opts.on_tail("-h", "--help", "Show this message") do
+		puts opts
+		exit
+	end
+end.parse!
+
+if not options[:name]
+	puts "Please specify the network name with -n"
+	puts "For help, use -h"
+	exit
+end
+
+c = DDcloud::Client.new @credentials[:url], @credentials[:org_id], @credentials[:user], @credentials[:pass]
+
+network = c.network.show_by_name options[:name]
+
+if not network
+	puts "A network with this name does not exist"
+	exit
+end
+
+network_id = network[:id]
+
+servers = c.server.list(network_id: network_id)
+
+servers.each do |server|
+	pp "Starting #{server[:name]}"
+	c.server.start(server[:id])
+end

data/examples/util.rb

@@ -0,0 +1,20 @@
+
+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

data/lib/ddcloud/client.rb

@@ -18,7 +18,7 @@ module DDcloud
 
 
 
-    def initialize(api_base, org_id, username, password, default_password="verysecurepassword", datacenter="EU1", colors = true, silent = false)
+    def initialize(api_base, org_id, username, password, default_password="verysecurepassword", datacenter="EU1", colors = true, silent = true)
       @api_base = api_base
       @org_id       = org_id
       @username     = username
@@ -77,8 +77,11 @@ module DDcloud
     end
 
     # mode: bold, underscore, default
-    def log(message, color = nil, mode = nil)
-      return if @silent
+    def log_error(message, color=nil, mode=nil)
+	log message, color, mode, true
+    end
+    def log(message, color = nil, mode = nil, error=nil)
+      return if (@silent && (not error))
       if @colors
         color = color.to_sym if color
         mode = mode.to_sym if mode

data/lib/ddcloud/connection.rb

@@ -43,17 +43,17 @@ module DDcloud
       if response.success?
         log "...........success!", :yellow
       elsif response.timed_out?
-        log "ERROR\n-----", :red
-        log "got a time out"
+        log_error "ERROR\n-----", :red
+        log_error "got a time out"
       elsif response.code == 0
         # Could not get an http response, something's wrong.
-        log "ERROR\n-----", :red
-        log response.return_message
+        log_error "ERROR\n-----", :red
+        log_error response.return_message
       else
         # Received a non-successful http response.
-        log "ERROR\n-----", :red
-        log "HTTP request failed: " + response.code.to_s, :red
-        log response.body, :yellow
+        log_error "ERROR\n-----", :red
+        log_error "HTTP request failed: " + response.code.to_s, :red
+        log_error response.body, :yellow
       end
     end
   end

data/lib/ddcloud/version.rb

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

data/lib/ddcloud.rb

@@ -4,19 +4,19 @@ require 'typhoeus'
 require 'xmlsimple'
 require 'hashie'
 
-require './ddcloud/version.rb'
-require './ddcloud/exceptions.rb'
+require 'ddcloud/version.rb'
+require 'ddcloud/exceptions.rb'
 
-require './ddcloud/connection.rb'
-require './ddcloud/params.rb'
-require './ddcloud/xml.rb'
-require './ddcloud/client.rb'
+require 'ddcloud/connection.rb'
+require 'ddcloud/params.rb'
+require 'ddcloud/xml.rb'
+require 'ddcloud/client.rb'
 
-require './ddcloud/api/core.rb'
-require './ddcloud/api/directory.rb'
-require './ddcloud/api/image.rb'
-require './ddcloud/api/network.rb'
-require './ddcloud/api/server.rb'
-require './ddcloud/api/vip.rb'
-require './ddcloud/api/account.rb'
-require './ddcloud/api/report.rb'
+require 'ddcloud/api/core.rb'
+require 'ddcloud/api/directory.rb'
+require 'ddcloud/api/image.rb'
+require 'ddcloud/api/network.rb'
+require 'ddcloud/api/server.rb'
+require 'ddcloud/api/vip.rb'
+require 'ddcloud/api/account.rb'
+require 'ddcloud/api/report.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: didata_cloud_sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Juozas Gaigalas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -117,6 +117,12 @@ files:
 - doc/schemas.txt
 - doc/sections.txt
 - doc/urls.txt
+- examples/README.md
+- examples/list_networks.rb
+- examples/list_servers_in_network.rb
+- examples/make_servers_in_new_network.rb
+- examples/start_all_servers_in_network.rb
+- examples/util.rb
 - lib/ddcloud.rb
 - lib/ddcloud/api/account.rb
 - lib/ddcloud/api/core.rb