cloudconfig 0.1.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f9fbb1c3690722f460de0b9f05d5b25089e72217
+  data.tar.gz: 76904f5715a14580d938762f661082089b7ed6ce
+SHA512:
+  metadata.gz: 2866cd11bbe9b214c0968ac885d460fc64bfae8da8635eb7e33ba281f8dce4c423e33601886bfa1b8b6c08d5a1dfd44a790b1cf6a08f752c48ef720ab600bf2f
+  data.tar.gz: da098dbdbf9f71bee3de73262cc8f99fdbf9b12b9d4587226e13fd247235b168da1e4b8de1dd5ab90fc4588670dd6786bc541383797543550843aff22132040a

data/README.md

@@ -1,6 +1,7 @@
 # Cloudconfig
 
 [![Build Status](https://travis-ci.org/klarna/cloudconfig.png?branch=master)](https://travis-ci.org/klarna/cloudconfig)
+[![Gem Version](https://badge.fury.io/rb/cloudconfig.png)](http://badge.fury.io/rb/cloudconfig)
 
 Cloudconfig is an application that manages configurations for resources in Cloudstack.
 
@@ -41,7 +42,8 @@ Cloudconfig will configure resources in Cloudstack according to resources in yam
 Resources that currently are handled by cloudconfig:
 
 - Compute offerings (create, update, delete)
-- Disk offerings (update)
+- Disk offerings (create, update, delete)
+- System offerings (create, update, delete)
 - Host tags (create, delete)
 - Storage tags (create, delete)
 
@@ -51,18 +53,26 @@ Resource files are expected to be structured in following manner in configured r
     ├── diskofferings.yaml
     ├── hosts.yaml
     ├── serviceofferings.yaml
-    └── storages.yaml
+    ├── storages.yaml 
+    └── systemofferings.yaml
 
 diskofferings.yaml:
 
     DiskOfferings:
-      20gb: { tags: "SSD",
-              displaytext: "20GB SSD Drive",
-              disksize: 200 }
+      20gb:   { tags: "SSD",
+                displaytext: "20GB SSD Drive",
+                iscustomized: false,
+                disksize: 200 }
 
-      50GB: { tags: "SSD",
-              displaytext: "50GB SSD Drive",
-              disksize: 50 }
+      50GB:   { tags: "SSD",
+                displaytext: "50GB SSD Drive",
+		iscustomized: false,
+                disksize: 50 }
+
+      Custom: { tags: "",
+                displaytext: "Customized disk offering size",
+                iscustomized: true,
+		disksize: 0 }
 
 hosts.yaml:
 
@@ -93,12 +103,30 @@ storage.yaml:
       ssd: { tags: "ssd",
              zonename: "example" }
 
+systemofferings.yaml:
+
+    SystemOfferings:
+      console-proxy: { displaytext: "1vCPU, 500MHz, 1GB RAM",
+                       cpunumber: 1,
+                       cpuspeed: 500,
+                       memory: 1024,
+                       storagetype: "shared",
+                       issystem: true,
+                       systemvmtype: "consoleproxy" }
+      domain-router: { displaytext: "1vCPU, 500MHz, 256MB RAM",
+                       cpunumber: 1,
+                       cpuspeed: 500,
+                       memory: 256,
+                       storagetype: "shared",
+                       issystem: true,
+                       systemvmtype: "domainrouter" }
+
 ### Testing
 
 Currently only unit testing:
 
     bundle install
-    bundle exec ruby test/test.rb
+    rake
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+task :unit_tests do
+  load "test/test.rb"
+end
+
+task :default => :unit_tests

data/bin/cloudconfig

@@ -29,12 +29,14 @@ module Cloudconfig
 	  end
 	  desc "update RESOURCE", "Updates RESOURCE from configuration yaml file."
 	  long_desc <<-LONGDESC
-	    `update serviceofferings` will configure service offerings.
-	    \x5`update hosts` will configure hosts.
-	    \x5`update storages` will configure storage pools.
-	    \x5`update diskofferings` will configure disk offerings.
+	    `update serviceofferings` will configure service offerings. (X)
+	    \x5`update hosts` will configure hosts tags.
+	    \x5`update storages` will configure storage pools tags.
+	    \x5`update diskofferings` will configure disk offerings. (X)
+            \x5`update systemofferings` will configure system offerings. (X)
+            \x5`Marked with X` - The resource will be have a new ID number when updated, if there are more than 'displaytext', 'displayoffering' and 'sortkey' that have been given new values.
 	  LONGDESC
-	  option :delete, :desc => "delete option for service offerings, resources existing in CloudPlatform but not in configuation yaml file are deleted in CloudPlatform."
+	  option :delete, :desc => "delete option for service offerings, disk offerings and system offerings - resources existing in CloudPlatform but not in configuation yaml file are deleted in CloudPlatform."
 	  option :dryrun, :desc => "dry run option, changes that should be made are listed, but not performed."
 	  def update(resource)
 	    r = Resources.new(resource)

data/cloudconfig.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["katrin.nilsson@klarna.com", "carl.loa.odin@klarna.com", "olle.lundberg@klarna.com"]
   spec.description   = %q{Cloudconfig is an application that manages configurations for resources in Cloudstack.}
   spec.summary       = %q{Resource configuration manager for Cloudstack.}
-  spec.homepage      = ""
+  spec.homepage      = "https://rubygems.org/gems/cloudconfig"
   spec.license       = "Apache License, Version 2.0"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.3.2"
+  spec.add_development_dependency "rake", "~> 10.3", ">= 10.3.2"
 
-  spec.add_runtime_dependency "thor", "~> 0.19.1"
-  spec.add_runtime_dependency "user_config", "~> 0.0.4"
-  spec.add_runtime_dependency "cloudstack_ruby_client", "~> 1.0.1"
+  spec.add_runtime_dependency "thor", "~> 0.19", ">= 0.19.1"
+  spec.add_runtime_dependency "user_config", "~> 0.0", ">= 0.0.4"
+  spec.add_runtime_dependency "cloudstack_ruby_client", "~> 1.0", ">= 1.0.1"
 end

data/lib/cloudconfig/resources.rb

@@ -5,170 +5,322 @@ require 'cloudstack_ruby_client'
 require 'user_config'
 
 module Cloudconfig
-	class Resources
-
-
-		attr_accessor :config, :delete, :dryrun, :resource, :client, :config_file
-
-
-		def initialize(resource)
-			@delete = false
-			@dryrun = false
-			@resource = resource
-			uconfig = UserConfig.new('.cloudconfig')
-			@config_file = uconfig['config.yaml']
-		end
-
-
-		def update()
-			@client = create_cloudstack_client()
-			resource_file, resource_cloud = define_yamlfile_and_cloudresource()
-			r_updated, r_created, r_deleted = check_resource(resource_file, resource_cloud)
-			feedback = ""
-			if @dryrun
-				feedback = "The following actions would be performed with this command:\n"
-			else
-				for r in r_updated
-					r_diff = Hash[(r[0].to_a) - (r[1].to_a)]
-					r_union = Hash[r[0].to_a | r_diff.to_a]
-					update_resource(r_union)
-				end
-				r_created.each{ |r| create_resource(r) }
-				r_deleted.each{ |r| delete_resource(r) }
-			end
-			for r in r_updated
-				# r_diff represents the parameters that should be changed in resource
-				r_diff = Hash[(r[0].to_a) - (r[1].to_a)]
-				feedback += "Some values has been changed in #{@resource} named #{r[0]["name"]}.\nOld values were:\n#{JSON.pretty_generate(r[1])}\nNew values are:\n#{JSON.pretty_generate(r_diff)}\n"
-			end
-			r_created.each{ |r| feedback += "#{@resource} named #{r["name"]} has been created\n" }
-			r_deleted.each{ |r| feedback += "#{@resource} named #{r["name"]} has been deleted\n" }
-			puts feedback
-		end
-
-
-		def create_cloudstack_client()
-			client = CloudstackRubyClient::Client.new(@config_file["url"], @config_file["api_key"], @config_file["secret_key"], true)
-			return client
-		end
-
-
-		# Save the current list of resources in resource_cloud, and the ones in the yaml file in resource_file
-		def define_yamlfile_and_cloudresource()
-			if @resource == "serviceofferings"
-				resource_title = "ServiceOfferings"
-				resource_cloud = @client.list_service_offerings()["serviceoffering"]
-			elsif @resource == "hosts"
-				resource_title = "Hosts"
-				resource_cloud = @client.list_hosts()["host"]
-			elsif @resource == "storages"
-				resource_title = "Storages"
-				resource_cloud = @client.list_storage_pools()["storagepool"]
-			elsif @resource == "diskofferings"
-				resource_title = "DiskOfferings"
-				resource_cloud = @client.list_disk_offerings()["diskoffering"]
-			end
-			resource_file = YAML.load_file("#{@config_file["resource_directory"]}/#{@resource}.yaml")["#{resource_title}"]
-			return resource_file, resource_cloud
-		end
-
-
-		# Compare resources in cloud and yaml file
-		def check_resource(resource_file, resource_cloud)
-			updated = Array.new
-			created = Array.new
-			deleted = Array.new
-			for r in resource_file
-				r_total = r[1].merge({"name" => "#{r[0]}"})
-				found = false
-				i = 0
-				# If the resource has not yet been found, compare names and update resource if names match but other parameters don't
-				while !found && i < resource_cloud.length
-					if resource_cloud[i]["name"] == r[0]
-						new_resource = resource_cloud[i].merge(r[1])
-						if resource_cloud[i] != new_resource
-							r_total = r_total.merge({"id" => "#{resource_cloud[i]["id"]}"})
-							# Update resource with new values, in first parameter, and send old values in second parameter
-							updated.push([r_total, resource_cloud[i]])
-						end
-						resource_cloud.delete_at(i)
-						found = true
-					else
-						i += 1
-					end
-				end
-				if (!found) && (@resource == "serviceofferings")
-					# Create resources. (Only works for service offerings at the moment)
-					created.push(r_total)
-				end
-			end
-			if delete && (resource_cloud.length > 0) && (@resource == "serviceofferings")
-				# Remove all resources that are not included in yaml file. (Only works for service offerings at the moment)
-				for r in resource_cloud
-					deleted.push(r)
-				end
-			end
-			# Return resources that should be updated, created and deleted
-			return updated, created, deleted
-		end
-
-
-		def update_resource(res)
-			if @resource == "serviceofferings"
-				@client.delete_service_offering({"id" => "#{res["id"]}"})
-				@client.create_service_offering(res)
-			elsif @resource == "hosts"
-				@client.update_host(res)
-			elsif @resource == "storages"
-				@client.update_storage_pool(res)
-			elsif @resource == "diskofferings"
-				# Parameter iscustomized has different name (customized) when creating resource, and parameter disksize create error if iscustomized is true.
-				if res["iscustomized"] == true
-					res.delete("disksize")
-				end
-				res = res.merge({"customized" => res["iscustomized"]})
-				res.delete("iscustomized")
-				@client.delete_disk_offering({"id" => "#{res["id"]}"})
-				@client.create_disk_offering(res)
-			end
-		end
-
-
-		def create_resource(res)
-			if @resource == "serviceofferings"
-				@client.create_service_offering(res)
-			end
-		end
-
-
-		def delete_resource(res)
-			if @resource == "serviceofferings"
-				@client.delete_service_offering({"id" => "#{res["id"]}"})
-			end
-		end
-
-		def list_resources()
-			@client = create_cloudstack_client()
-			resource_file, resource_cloud = define_yamlfile_and_cloudresource()
-			puts JSON.pretty_generate(resource_cloud)
-		end
-
-		def compare_resources()
-			@delete = true
-			@client = create_cloudstack_client()
-			resources = ["serviceofferings", "hosts", "storages", "diskofferings"]
-			for r in resources
-				@res = r
-				resource_file, resource_cloud = define_yamlfile_and_cloudresource()
-				r_updated, r_created, r_deleted = check_resource(resource_file, resource_cloud)
-				puts "The following #{r} will be updated:"
-				r_updated.each{ |re| puts "\n#{re[0]["name"]}" }
-				puts "The following #{r} will be created:"
-				r_created.each{ |re| puts "\n#{re["name"]}" }
-				puts "The following #{r} will be deleted:"
-				r_deleted.each{ |re| puts "\n#{re["name"]}" }
-			end
-		end
-
-	end
+  class Resources
+
+
+    attr_accessor :config, :delete, :dryrun, :resource, :client, :config_file
+
+
+    def initialize(resource)
+      @delete = false
+      @dryrun = false
+      @resource = resource
+      uconfig = UserConfig.new('.cloudconfig')
+      @config_file = uconfig['config.yaml']
+    end
+
+
+    def update()
+      @client = create_cloudstack_client()
+      begin
+        resource_file, resource_cloud = define_yamlfile_and_cloudresource()
+      rescue Exception => error_msg
+        raise error_msg, "Resource could not be loaded from configuration file and/or the cloud."
+      end
+      r_updated, r_created, r_deleted = check_resource(resource_file, resource_cloud)
+      if @dryrun
+        puts "The following actions would be performed with this command:"
+      end
+      for updated in r_updated
+        begin
+          updated_resource, only_updated = update_resource(updated)
+          if !updated_resource.empty?
+            if only_updated
+              puts "Some values have been changed in the #{@resource} named #{updated_resource[0]}.\nOld values were:\n#{JSON.pretty_generate(updated_resource[1])}\nNew values are:\n#{JSON.pretty_generate(updated_resource[2])}"
+            else
+              puts "The #{@resource} named #{updated_resource[0]} has been recreated.\nOld values were:\n#{JSON.pretty_generate(updated_resource[1])}\nNew values are:\n#{JSON.pretty_generate(updated_resource[2])}"
+            end
+          end
+        rescue CreationError => error_msg
+          puts "#{updated[0]["name"]} could not be updated since: #{error_msg}"
+        end
+      end
+      for created in r_created
+        begin
+          created_resource = create_resource(created)
+          if !created_resource.empty?
+            puts "The #{@resource} named #{created_resource[0]} has been created"
+          end
+        rescue CreationError => error_msg
+          puts "#{created["name"]} could not be created since: #{error_msg}"
+        end
+      end
+      for deleted in r_deleted
+        deleted_resource = delete_resource(deleted)
+        if !deleted_resource.empty?
+          puts "The #{@resource} named #{deleted_resource[0]} has been deleted"
+        end
+      end
+    end
+
+
+    def create_cloudstack_client()
+      client = CloudstackRubyClient::Client.new(@config_file["url"], @config_file["api_key"], @config_file["secret_key"], true)
+      return client
+    end
+
+
+    # Save the current list of resources in resource_cloud, and the ones in the yaml file in resource_file
+    def define_yamlfile_and_cloudresource()
+      if @resource == "serviceofferings"
+        resource_title = "ServiceOfferings"
+        resource_cloud = @client.list_service_offerings()["serviceoffering"]
+      elsif @resource == "hosts"
+        resource_title = "Hosts"
+        resource_cloud = @client.list_hosts()["host"]
+      elsif @resource == "storages"
+        resource_title = "Storages"
+        resource_cloud = @client.list_storage_pools()["storagepool"]
+      elsif @resource == "diskofferings"
+        resource_title = "DiskOfferings"
+        resource_cloud = @client.list_disk_offerings()["diskoffering"]
+      elsif @resource == "systemofferings"
+        resource_title = "SystemOfferings"
+        resource_cloud = @client.list_service_offerings({"issystem" => true})["serviceoffering"]
+      end
+      resource_file = YAML.load_file("#{@config_file["resource_directory"]}/#{@resource}.yaml")["#{resource_title}"]
+      return resource_file, resource_cloud
+    end
+
+
+    # Compare resources in cloud and yaml file
+    def check_resource(resource_file, resource_cloud)
+      updated = Array.new
+      created = Array.new
+      deleted = Array.new
+      for r in resource_file
+        r_total = r[1].merge({"name" => "#{r[0]}"})
+        found = false
+        i = 0
+        # If the resource has not yet been found, compare names and update resource if names match but other parameters don't
+        while !found && i < resource_cloud.length
+          if resource_cloud[i]["name"] == r[0]
+            new_resource = resource_cloud[i].merge(r[1])
+            if resource_cloud[i] != new_resource
+              r_total = r_total.merge({"id" => "#{resource_cloud[i]["id"]}"})
+              # Update resource with new values, in first parameter, and send old values in second parameter
+              updated.push([r_total, resource_cloud[i]])
+            end
+            resource_cloud.delete_at(i)
+            found = true
+          else
+            i += 1
+          end
+        end
+        if (!found) && ((@resource == "serviceofferings") || (@resource == "diskofferings") || (@resource == "systemofferings"))
+          # Create resources
+          created.push(r_total)
+        end
+      end
+      if delete && (resource_cloud.length > 0) && ((@resource == "serviceofferings") || (@resource == "diskofferings") || (@resource == "systemofferings"))
+        # Remove all resources that are not included in yaml file. (Only works for service offerings at the moment)
+        for r in resource_cloud
+          deleted.push(r)
+        end
+      end
+      # Return resources that should be updated, created and deleted
+      return updated, created, deleted
+    end
+
+
+    def update_resource(res)
+      updated = true
+      updated_resource = Array.new
+      # 'res_union' contains the the parameters that the new, updated or recreated, resource should contain
+      res_union = Hash[res[1].to_a | res[0].to_a]
+      # 'res_diff' contains the parameters that differs from the existing resource, and represents what will be added/changed
+      res_diff, needs_recreation = required_changes(res)
+      if !res_diff.empty?
+        # All these resources could need recreation and are controlled, to see if all nedded requirements are met.
+        if (@resource == "serviceofferings") || (@resource == "systemofferings") || (@resource == "diskofferings")
+          if needs_recreation
+            updated = false
+            if has_recreated_resource?(res_union)
+              updated_resource.push(res[0]["name"], res[1], res_diff)
+            end
+          else
+            # Only an update is nedded
+            if (@resource == "serviceofferings") || (@resource == "systemofferings")
+              if !@dryrun
+                @client.update_service_offering(res_union)
+              end
+            elsif @resource == "diskofferings"
+              if !@dryrun
+                @client.update_disk_offering(res_union)
+              end
+            else
+              updated = false
+            end
+          end
+          # All these resources can only be updated.
+        elsif (@resource == "hosts") || (@resource == "storages")
+          if @resource == "hosts"
+            if !@dryrun
+              @client.update_host(res_union)
+            end
+          elsif @resource == "storages"
+            if !@dryrun
+              @client.update_storage_pool(res_union)
+            end
+          else
+            updated = false
+          end
+        end
+      else
+        updated = false
+      end
+      if updated
+        updated_resource.push(res[0]["name"], res[1], res_diff)
+      end
+      return updated_resource, updated
+    end
+
+
+    def required_changes(res)
+      # Find the parameters that differs
+      res_diff = Hash[(res[0].to_a) - (res[1].to_a)]
+      res_diff.delete_if { |param| param == "id" }
+      changes = res_diff.clone
+      # If the parameters that differs only contain the following keys, then the resource only needs an update. Otherwise, a recreation is required.
+      only_update_parameters = ["displaytext", "sortkey", "displayoffering"]
+      only_update_parameters.each { |searched_param| changes.delete_if { |actual_param| actual_param == searched_param } }
+      # Remove all changes that aren't actually changes, to avoid unnecessary updates
+      for param, value in changes
+        if (!res[1].has_key?(param) || (res[1][param] == "")) && (value == "")
+          changes.delete(param)
+          res_diff.delete(param)
+        end
+      end
+      needs_recreation = false
+      if !changes.empty?
+        needs_recreation = true
+      end
+      return res_diff, needs_recreation 
+    end
+
+
+    def has_recreated_resource?(res)
+      # The resource should only be deleted if it can be recreated, so a dryrun check needs to be made to assure this
+      actual_dryrun = @dryrun
+      @dryrun = true
+      created = create_resource(res)
+      if !created.empty?
+        # No errors occured, and an actual run can be made
+        @dryrun = actual_dryrun
+        deleted = delete_resource(res)
+        created = create_resource(res)
+        return true
+      end
+      @dryrun = actual_dryrun
+      return false
+    end
+
+
+    def create_resource(res)
+      check_for_creation_errors(res)
+      created = Array.new
+      created.push(res["name"])
+      if (@resource == "serviceofferings") || (@resource == "systemofferings")
+        if @resource == "systemofferings"
+          # All system offerings needs to include this
+          res["issystem"] = true
+        end
+        if !@dryrun
+          @client.create_service_offering(res)
+        end
+      elsif (@resource == "diskofferings")
+        # Parameter 'iscustomized' has different name ('customized') when creating resource, and parameter disksize create error if iscustomized is true
+        if res.has_key?("iscustomized") && res["iscustomized"] == true
+          res.delete("disksize")
+        end
+        res = res.merge({"customized" => res["iscustomized"]})
+        res.delete("iscustomized")
+        if !@dryrun
+          @client.create_disk_offering(res)
+        end
+      end
+      created
+    end
+
+
+    def delete_resource(res)
+      deleted = Array.new
+      if (@resource == "serviceofferings") || (@resource == "systemofferings")
+        deleted.push(res["name"])
+        if !@dryrun
+          @client.delete_service_offering({"id" => "#{res["id"]}"})
+        end
+      elsif (@resource == "diskofferings")
+        deleted.push(res["name"])
+        if !@dryrun
+          @client.delete_disk_offering({"id" => "#{res["id"]}"})
+        end
+      end
+      deleted
+    end
+
+
+    def check_for_creation_errors(res)
+      errors = Array.new
+      if !res.has_key?("displaytext")
+        errors.push("'displaytext' has not been specified in configuration file.")
+      end
+      if @resource == "diskofferings"
+        if (!res.has_key?("iscustomized") || (res["iscustomized"] == false)) && (!res.has_key?("disksize") || (res["disksize"] == 0))
+          errors.push("'iscustomized' is unspecified or set to false and 'disksize' has not been specified, or has been specified to a value of 0 or below.")
+        end
+      elsif (@resource == "serviceofferings") || (@resource == "systemofferings")
+        if !res.has_key?("cpunumber") || !res.has_key?("cpuspeed") || !res.has_key?("memory") || (res["cpunumber"] <= 0) || (res["cpuspeed"] <= 0) || (res["memory"] <= 0)
+          errors.push("'cpunumber', 'cpuspeed' and/or 'memory' has not been defined, or is defined as 0 or below.")
+        end
+        if @resource == "systemofferings"
+          approved_systemvmtype = ["domainrouter", "consoleproxy", "secondarystoragevm"]
+          if !res.has_key?("systemvmtype") || !approved_systemvmtype.include?(res["systemvmtype"])
+              errors.push("'systemvmtype' is unspecified or set to a value not valid in Cloudconfig.")
+          end
+        end
+      end
+      if !errors.empty?
+        raise CreationError, errors
+      end
+    end
+
+
+    def list_resources()
+      @client = create_cloudstack_client()
+      resource_file, resource_cloud = define_yamlfile_and_cloudresource()
+      puts JSON.pretty_generate(resource_cloud)
+    end
+
+    def compare_resources()
+      @delete = true
+      @client = create_cloudstack_client()
+      resources = ["serviceofferings", "hosts", "storages", "diskofferings", "systemofferings"]
+      for r in resources
+        @res = r
+        resource_file, resource_cloud = define_yamlfile_and_cloudresource()
+        r_updated, r_created, r_deleted = check_resource(resource_file, resource_cloud)
+        puts "The following #{r} will be updated:"
+        r_updated.each{ |re| puts "\n#{re[0]["name"]}" }
+        puts "The following #{r} will be created:"
+        r_created.each{ |re| puts "\n#{re["name"]}" }
+        puts "The following #{r} will be deleted:"
+        r_deleted.each{ |re| puts "\n#{re["name"]}" }
+      end
+    end
+
+  end
+
+  class CreationError < Exception
+  end
 end

data/lib/cloudconfig/version.rb

@@ -1,3 +1,3 @@
 module Cloudconfig
-  VERSION = "0.1.1"
+  VERSION = "0.4.0"
 end

data/test/helper/test_helper.rb

@@ -4,15 +4,30 @@ class TestHelper
     resource_cloud = [
       { "name" => "Resource-01",
         "id" => 111,
-        "tag" => "RES"
+        "displaytext" => "Description A",
+        "tag" => "RES",
+        "cpunumber" => 1,
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "domainrouter",
+        "iscustomized" => false,
+        "disksize" => 1
       },
       { "name" => "Resource-02",
         "id" => 222,
-        "tag" => "RES"
+        "displaytext" => "Description B",
+        "tag" => "RES",
+        "cpunumber" => 1,
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "domainrouter",
+        "iscustomized" => false,
+        "disksize" => 1
       },
       { "name" => "Resource-03",
         "id" => 333,
-        "tag" => "RAN"
+        "displaytext" => "Description C",
+        "tag" => "RAN",
       }
     ]
     return resource_cloud.to_a
@@ -20,17 +35,78 @@ class TestHelper
 
   def get_resource_file()
     resource_file = {
+        # Displaytext has changed in Resource-01
       "Resource-01" => {
-        "id" => 111,
-        "tag" => "RES"
+        "displaytext" => "A different description",
+        "tag" => "RES",
+        "cpunumber" => 1,
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "domainrouter",
+        "iscustomized" => false,
+        "disksize" => 1
       },
+        # Tags has changed in Resource-02
       "Resource-02" => {
-        "id" => 222,
-        "tag" => "RAN"
+        "displaytext" => "Description B",
+        "tag" => "RAN",
+        "cpunumber" => 1,
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "domainrouter",
+        "iscustomized" => false,
+        "disksize" => 1
       },
+        # Resource-03 has been deleted
+        # The resources below should be up for creation
+        # serviceofferings, systemofferings and diskofferings: Resource-04 should be created
       "Resource-04" => {
-        "id" => 444,
-        "tag" => "RAN"
+        "displaytext" => "Description D",
+        "cpunumber" => 1,
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "domainrouter",
+        "iscustomized" => false,
+        "disksize" => 1
+      },
+        # serviceofferings, systemofferings and diskofferings: Resouce-05 does not have 'displaytext' and should not be created
+      "Resource-05" => {
+        "cpunumber" => 1,
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "consoleproxy",
+        "iscustomized" => true
+      },
+        # serviceofferings and systemofferings: Resource-06 doas not have 'cpunumber' and should not be created
+        # diskofferings: Resource-06 should be created
+      "Resource-06" => {
+        "displaytext" => "Description F",
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "secondarystoragevm",
+        "iscustomized" => true
+      },
+        # serviceofferings and systemofferings: Resource-07 does not have valid 'cpuspeed' value and can not be created
+        # diskofferings: Resource-07 has 'iscustomized' = false but does not have 'disksize' and should not be created
+      "Resource-07" => {
+        "displaytext" => "Description G",
+        "cpunumber" => 1,
+        "cpuspeed" => 0,
+        "memory" => 1,
+        "systemvmtype" => "domainrouter",
+        "iscustomized" => false
+      },
+        # serviceofferings: Resource-08 should be created
+        # systemofferings: Resource-08 does not have a valid 'systemvmtype' and can not be created
+        # diskofferings: Resource-08 does not have a valid 'disksize'i and should not be created
+      "Resource-08" => {
+        "displaytext" => "Description H",
+        "cpunumber" => 1,
+        "cpuspeed" => 1,
+        "memory" => 1,
+        "systemvmtype" => "invalidsystemvmtype",
+        "iscustomized" => false,
+        "disksize" => 0
       }
     }
     return resource_file  

data/test/test.rb

@@ -11,7 +11,8 @@ class TestResources < Test::Unit::TestCase
     @res = [Cloudconfig::Resources.new("serviceofferings"),
             Cloudconfig::Resources.new("hosts"),
             Cloudconfig::Resources.new("storages"),
-            Cloudconfig::Resources.new("diskofferings")]
+            Cloudconfig::Resources.new("diskofferings"),
+            Cloudconfig::Resources.new("systemofferings")]
 
     for r in @res
       r.delete = false
@@ -24,81 +25,152 @@ class TestResources < Test::Unit::TestCase
 
   def test_update_serviceofferings_delete_is_false
     # Test array and hash in test_helper.rb, with delete option set to false in setup
-    upd, cre, del = @res[0].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(1, cre.length)
-    assert_equal("Resource-04", "#{cre[0]["name"]}")
-    assert_equal(0, del.length)
+    resource = @res[0]
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
   end
 
   # Same test, with delete set to true
   def test_update_serviceofferings_delete_is_true
-    @res[0].delete = true
-    upd, cre, del = @res[0].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(1, cre.length)
-    assert_equal("Resource-04", "#{cre[0]["name"]}")
-    assert_equal(1, del.length)
-    assert_equal("Resource-03", "#{del[0]["name"]}")
+    resource = @res[0]
+    resource.delete = true
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
+  end
+
+  def test_update_systemofferings_delete_is_false
+    resource = @res[4]
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
+  end
+
+  def test_update_systemofferings_delete_is_true
+    resource = @res[4]
+    resource.delete = true
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
   end
 
   def test_update_hosts_delete_is_false
-    # Test array and hash in test_helper.rb, with delete option set to false in setup
-    upd, cre, del = @res[1].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(0, cre.length)
-    assert_equal(0, del.length)
+    resource = @res[1]
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
   end
 
-  # Same test, with delete set to true
   def test_update_hosts_delete_is_true
-    @res[1].delete = true
-    upd, cre, del = @res[1].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(0, cre.length)
-    assert_equal(0, del.length)
+    resource = @res[1]
+    resource.delete = true
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
   end
 
   def test_update_storages_delete_is_false
-    # Test array and hash in test_helper.rb, with delete option set to false in setup
-    upd, cre, del = @res[2].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(0, cre.length)
-    assert_equal(0, del.length)
+    resource = @res[2]
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
   end
 
-  # Same test, with delete set to true
   def test_update_storages_delete_is_true
-    @res[2].delete = true
-    upd, cre, del = @res[2].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(0, cre.length)
-    assert_equal(0, del.length)
+    resource = @res[2]
+    resource.delete = true
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
   end
 
   def test_update_diskofferings_delete_is_false
-    # Test array and hash in test_helper.rb, with delete option set to false in setup
-    upd, cre, del = @res[3].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(0, cre.length)
-    assert_equal(0, del.length)
+    resource = @res[3]
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
   end
 
-  # Same test, with delete set to true
   def test_update_diskofferings_delete_is_true
-    @res[3].delete = true
-    upd, cre, del = @res[3].check_resource(@r_test_file, @r_test_cloud)
-    assert_equal(1, upd.length)
-    assert_equal("Resource-02", "#{upd[0][0]["name"]}")
-    assert_equal(0, cre.length)
-    assert_equal(0, del.length)
+    resource = @res[3]
+    resource.delete = true
+    upd, cre, del = resource.check_resource(@r_test_file, @r_test_cloud)
+    control_updates(upd, resource)
+    control_creates(cre, resource)
+    control_deletes(del, resource)
+  end
+
+  def control_updates(updated_resources, resource)
+    assert_equal(2, updated_resources.length, "Two resources should be checked for updation")
+    updated_resources.each { |r| assert(["Resource-01", "Resource-02"].include?(r[0]["name"])) }
+    recreatable = false
+    # if resource is serviceofferings, diskofferings or systemofferings
+    if (resource == @res[0]) || (resource == @res[3]) || (resource == @res[4])
+      recreatable = true
+    end
+    for updated in updated_resources
+      r, only_updated = resource.update_resource(updated)
+      assert(!r.empty?, "A call to the update_resource method did not return an updated #{resource}")
+      if recreatable
+        if r[0] == "Resource-01"
+          assert(only_updated, "#{r[0]} should only be updated")
+        elsif r[0] == "Resource-02"
+          assert(!only_updated, "#{r[0]} should be recreated")
+        else
+          assert(false, "#{r[0]} should not be updated")
+        end
+      else
+        assert(only_updated, "#{resource} should only be updated")
+      end
+    end
+  end
+
+  def control_creates(created_resources, resource)
+    if (resource == @res[0]) || (resource == @res[3]) || (resource == @res[4])
+      assert_equal(5, created_resources.length, "Five resources should be checked for creation")
+      created_resources.each { |r| assert(["Resource-04", "Resource-05", "Resource-06", "Resource-07", "Resource-08"].include?(r["name"])) }
+      should_be_created = Array.new
+      # if resource is serviceofferings, systemofferings or diskofferings
+      should_be_created.push("Resource-04")
+      # if resource is serviceofferings
+      if resource == @res[0]
+        should_be_created.push("Resource-08")
+      # if resource is diskofferings
+      elsif resource == @res[3]
+        should_be_created.push("Resource-06")
+      end
+      for created in created_resources
+        if should_be_created.include?(created["name"])
+          r = resource.create_resource(created)
+          assert_equal(1, r.length, "#{r[0]} should be created without any problems")
+        else
+          assert_raise Cloudconfig::CreationError do
+            r = resource.create_resource(created)
+          end
+        end
+      end
+    else
+      assert(created_resources.empty?, "No #{resource} should be created, since the resource is not creatable")
+    end
+  end
+
+  def control_deletes(deleted_resources, resource)
+    if resource.delete && ((resource == @res[0]) || (resource == @res[3]) || (resource == @res[4]))
+      assert_equal(1, deleted_resources.length, "One #{resource} should be deleted, since the resource is deletable and 'delete' is #{resource.delete}")
+      assert_equal("Resource-03", "#{deleted_resources[0]["name"]}")
+    else
+      assert(deleted_resources.empty?, "No #{resource} should be deleted, since the resource is not deletable")
+    end
   end
 
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudconfig
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Katrin Nilsson
@@ -11,63 +10,102 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17262780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *17262780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17261260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.3'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
-  version_requirements: *17261260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.3'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17260780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
-  version_requirements: *17260780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: user_config
-  requirement: &17260320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *17260320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: cloudstack_ruby_client
-  requirement: &17259860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *17259860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: Cloudconfig is an application that manages configurations for resources
   in Cloudstack.
 email:
@@ -91,30 +129,29 @@ files:
 - lib/cloudconfig/version.rb
 - test/helper/test_helper.rb
 - test/test.rb
-homepage: ''
+homepage: https://rubygems.org/gems/cloudconfig
 licenses:
 - Apache License, Version 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Resource configuration manager for Cloudstack.
 test_files:
 - test/helper/test_helper.rb