cloudstack_ruby_client 0.1.0 → 0.1.1

data/lib/cloudstack_ruby_client/api/project_api.rb

@@ -1,14 +1,16 @@
-module Project
+module CloudstackRubyClient
   module Project
-    cmd_processor :create_project,
-                  :delete_project,
-                  :update_project,
-                  :activate_project,
-                  :suspend_project,
-                  :list_projects,
-                  :list_project_invitations,
-                  :update_project_invitaion,
-                  :delete_project_invitaion
-
+    module Project
+      cmd_processor :create_project,
+                    :delete_project,
+                    :update_project,
+                    :activate_project,
+                    :suspend_project,
+                    :list_projects,
+                    :list_project_invitations,
+                    :update_project_invitation,
+                    :delete_project_invitation
+  
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/securitygroup_api.rb

@@ -1,11 +1,13 @@
-module SecurityGroup
+module CloudstackRubyClient
   module SecurityGroup
-    cmd_processor :create_security_group,
-                  :delete_security_group,
-                  :authorize_security_group_ingress,
-                  :revoke_security_group_ingress,
-                  :authorize_security_group_egress,
-                  :revoke_security_group_egress,
-                  :list_security_groups
+    module SecurityGroup
+      cmd_processor :create_security_group,
+                    :delete_security_group,
+                    :authorize_security_group_ingress,
+                    :revoke_security_group_ingress,
+                    :authorize_security_group_egress,
+                    :revoke_security_group_egress,
+                    :list_security_groups
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/serviceoffering_api.rb

@@ -1,15 +1,17 @@
-module ServiceOffering
+module CloudstackRubyClient
   module ServiceOffering
-    cmd_processor :create_service_offering,
-                  :delete_service_offering,
-                  :update_service_offering,
-                  :list_service_offerings
-  end
-
-  module DiskOffering
-    cmd_processor :create_disk_offering,
-                  :update_disk_offering,
-                  :delete_disk_offering,
-                  :list_disk_offerings
+    module ServiceOffering
+      cmd_processor :create_service_offering,
+                    :delete_service_offering,
+                    :update_service_offering,
+                    :list_service_offerings
+    end
+  
+    module DiskOffering
+      cmd_processor :create_disk_offering,
+                    :update_disk_offering,
+                    :delete_disk_offering,
+                    :list_disk_offerings
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/snapshot_api.rb

@@ -1,11 +1,13 @@
-module Snapshot
+module CloudstackRubyClient
   module Snapshot
-    cmd_processor :create_snapshot,
-                  :list_snapshots,
-                  :delete_snapshot,
-                  :create_snapshot_policy,
-                  # FIXME: Weird deleteSnapshotPolicies command
-                  :delete_snapshot_policies,
-                  :list_snapshot_policies
+    module Snapshot
+      cmd_processor :create_snapshot,
+                    :list_snapshots,
+                    :delete_snapshot,
+                    :create_snapshot_policy,
+                    # FIXME: Weird deleteSnapshotPolicies command
+                    :delete_snapshot_policies,
+                    :list_snapshot_policies
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/storage_api.rb

@@ -1,16 +1,18 @@
-module Storage
-  module StoragePool
-    cmd_processor :list_storage_pools,
-                  :create_storage_pool,
-                  :update_storage_pool,
-                  :delete_storage_pool,
-                  :enable_storage_maintenance,
-                  :cancel_storage_maintenance
-  end
-
-  module ImageStore
-    cmd_processor :list_image_stores,
-                  :add_image_store,
-                  :delete_image_store
+module CloudstackRubyClient
+  module Storage
+    module StoragePool
+      cmd_processor :list_storage_pools,
+                    :create_storage_pool,
+                    :update_storage_pool,
+                    :delete_storage_pool,
+                    :enable_storage_maintenance,
+                    :cancel_storage_maintenance
+    end
+  
+    module ImageStore
+      cmd_processor :list_image_stores,
+                    :add_image_store,
+                    :delete_image_store
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/systemvm_api.rb

@@ -1,23 +1,25 @@
-module SystemVm
+module CloudstackRubyClient
   module SystemVm
-    cmd_processor :start_system_vm,
-                  :reboot_system_vm,
-                  :stop_system_vm,
-                  :destroy_system_vm,
-                  :list_system_vms,
-                  :migrate_system_vm,
-                  :change_service_for_system_vm
-  end
-
-  module Router
-    cmd_processor :start_router,
-                  :reboot_router,
-                  :stop_router,
-                  :destroy_router,
-                  :change_servce_for_router,
-                  :list_routers,
-                  :list_virtual_router_elements,
-                  :configure_virtual_router_element,
-                  :create_virtual_router_element
+    module SystemVm
+      cmd_processor :start_system_vm,
+                    :reboot_system_vm,
+                    :stop_system_vm,
+                    :destroy_system_vm,
+                    :list_system_vms,
+                    :migrate_system_vm,
+                    :change_service_for_system_vm
+    end
+  
+    module Router
+      cmd_processor :start_router,
+                    :reboot_router,
+                    :stop_router,
+                    :destroy_router,
+                    :change_service_for_router,
+                    :list_routers,
+                    :list_virtual_router_elements,
+                    :configure_virtual_router_element,
+                    :create_virtual_router_element
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/template_api.rb

@@ -1,32 +1,34 @@
-module Template
+module CloudstackRubyClient
   module Template
-    cmd_processor :create_template,
-                  :update_template,
-                  :copy_template,
-                  :delete_template,
-                  :list_templates,
-                  :update_template_permissions,
-                  :list_template_permissions,
-                  :extract_template,
-                  :prepare_template
-  end
-
-  module ISO
-    cmd_processor :attach_iso,
-                  :detach_iso,
-                  :list_isos,
-                  :update_iso,
-                  :delete_iso,
-                  :copy_iso,
-                  :update_iso_permissions,
-                  :list_iso_permissions,
-                  :extract_iso
-  end
-
-  module Registration
-    cmd_processor :register_template,
-                  :register_iso,
-                  :register_user_keys,
-                  :register_ssh_key_pair
+    module Template
+      cmd_processor :create_template,
+                    :update_template,
+                    :copy_template,
+                    :delete_template,
+                    :list_templates,
+                    :update_template_permissions,
+                    :list_template_permissions,
+                    :extract_template,
+                    :prepare_template
+    end
+  
+    module ISO
+      cmd_processor :attach_iso,
+                    :detach_iso,
+                    :list_isos,
+                    :update_iso,
+                    :delete_iso,
+                    :copy_iso,
+                    :update_iso_permissions,
+                    :list_iso_permissions,
+                    :extract_iso
+    end
+  
+    module Registration
+      cmd_processor :register_template,
+                    :register_iso,
+                    :register_user_keys,
+                    :register_ssh_key_pair
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/vm_api.rb

@@ -1,29 +1,31 @@
-module VirtualMachine
+module CloudstackRubyClient
   module VirtualMachine
-    cmd_processor :deploy_virtual_machine,
-                  :destroy_virtual_machine,
-                  :reboot_virtual_machine,
-                  :start_virtual_machine,
-                  :stop_virtual_machine,
-                  :reset_password_for_virtual_machine,
-                  :reset_sshkey_for_virtual_machine,
-                  :update_virtual_machine,
-                  :list_virtual_machines,
-                  :get_vm_password,
-                  :restore_virtual_machine,
-                  :change_service_for_virtual_machine,
-                  :assign_virtual_machine,
-                  :migrate_virtual_machine,
-                  :recover_virtual_machine,
-                  :add_nic_to_virtual_machine,
-                  :remove_nic_from_virtual_machine,
-                  :update_default_nic_for_virtual_machine
-  end
-  
-  module VMGroup
-    cmd_processor :create_instance_group,
-                  :delete_instance_group,
-                  :update_instance_group,
-                  :list_instance_groups
+    module VirtualMachine
+      cmd_processor :deploy_virtual_machine,
+                    :destroy_virtual_machine,
+                    :reboot_virtual_machine,
+                    :start_virtual_machine,
+                    :stop_virtual_machine,
+                    :reset_password_for_virtual_machine,
+                    :reset_ssh_key_for_virtual_machine,
+                    :update_virtual_machine,
+                    :list_virtual_machines,
+                    :get_vm_password,
+                    :restore_virtual_machine,
+                    :change_service_for_virtual_machine,
+                    :assign_virtual_machine,
+                    :migrate_virtual_machine,
+                    :recover_virtual_machine,
+                    :add_nic_to_virtual_machine,
+                    :remove_nic_from_virtual_machine,
+                    :update_default_nic_for_virtual_machine
+    end
+    
+    module VMGroup
+      cmd_processor :create_instance_group,
+                    :delete_instance_group,
+                    :update_instance_group,
+                    :list_instance_groups
+    end
   end
 end

data/lib/cloudstack_ruby_client/api/volume_api.rb

@@ -1,13 +1,15 @@
-module Volume
+module CloudstackRubyClient
   module Volume
-    cmd_processor :attach_volume,
-                  :upload_volume,
-                  :detach_volume,
-                  :create_volume,
-                  :delete_volume,
-                  :list_volumes,
-                  :extract_volume,
-                  :migrate_volume,
-                  :resize_volume
+    module Volume
+      cmd_processor :attach_volume,
+                    :upload_volume,
+                    :detach_volume,
+                    :create_volume,
+                    :delete_volume,
+                    :list_volumes,
+                    :extract_volume,
+                    :migrate_volume,
+                    :resize_volume
+    end
   end
 end

data/lib/cloudstack_ruby_client/base_client.rb

@@ -1,10 +1,10 @@
-require 'rubygems'
-require 'base64'
-require 'openssl'
-require 'uri'
-require 'cgi'
-require 'net/http'
-require 'json'
+# require 'rubygems'
+# require 'base64'
+# require 'openssl'
+# require 'uri'
+# require 'cgi'
+# require 'net/http'
+# require 'json'
 
 class CloudstackRubyClient::BaseClient
 
@@ -20,12 +20,12 @@ class CloudstackRubyClient::BaseClient
     params['apiKey'] = @api_key
 
     params_arr = []
-    params.sort.each do |elem|
+    params.each do |elem|
       params_arr << elem[0].to_s + '=' + CGI.escape(elem[1].to_s)\
-                                               .gsub('+', '%20').gsub(' ','%20')
+                                            .gsub('+', '%20').gsub(' ','%20')
     end
 
-    data = params_arr.join '&'
+    data = params_arr.sort.join '&'
 
     signature = OpenSSL::HMAC.digest 'sha1', @secret_key, data.downcase
     signature = Base64.encode64(signature).chomp
@@ -39,15 +39,6 @@ class CloudstackRubyClient::BaseClient
     request = Net::HTTP::Get.new(uri.request_uri)
 
     http.request(request)
-
-    # if !response.is_a?(Net::HTTPOK)
-    #   puts "Error #{response.code}: #{response.message}"
-    #   puts JSON.pretty_generate(JSON.parse(response.body))
-    #   puts "URL: #{url}"
-    #   exit 1
-    # end
-
-    # json = JSON.parse(response.body)
-    # json[params['command'].downcase + 'response']
   end
+
 end

data/lib/cloudstack_ruby_client/client.rb

@@ -1,75 +1,75 @@
-require_relative "client_helper"
-require_relative "api/config"
-
 class CloudstackRubyClient::Client < CloudstackRubyClient::BaseClient
   
   ## Infra Api commands injection
-  include Infrastructure::Region
-  include Infrastructure::Zone
-  include Infrastructure::Pod
-  include Infrastructure::Cluster
-  include Infrastructure::Host
+  include CloudstackRubyClient::Infrastructure::Region
+  include CloudstackRubyClient::Infrastructure::Zone
+  include CloudstackRubyClient::Infrastructure::Pod
+  include CloudstackRubyClient::Infrastructure::Cluster
+  include CloudstackRubyClient::Infrastructure::Host
 
 
   ## Accounts Api command injection
-  include Accounts::Domain
-  include Accounts::Account
-  include Accounts::User
-  include Accounts::Limit
-  include Accounts::Usage
+  include CloudstackRubyClient::Accounts::Domain
+  include CloudstackRubyClient::Accounts::Account
+  include CloudstackRubyClient::Accounts::User
+  include CloudstackRubyClient::Accounts::Limit
+  include CloudstackRubyClient::Accounts::Usage
 
   ## System VM commands injection
-  include VirtualMachine::VirtualMachine
-  include VirtualMachine::VMGroup
+  include CloudstackRubyClient::VirtualMachine::VirtualMachine
+  include CloudstackRubyClient::VirtualMachine::VMGroup
 
   ## Virtual Machine commands insjection
-  include SystemVm::SystemVm
-  include SystemVm::Router
+  include CloudstackRubyClient::SystemVm::SystemVm
+  include CloudstackRubyClient::SystemVm::Router
 
   ## Storage commands injection
-  include Storage::StoragePool
-  include Storage::ImageStore
+  include CloudstackRubyClient::Storage::StoragePool
+  include CloudstackRubyClient::Storage::ImageStore
 
   ## Network commands injection
-  include Network::NetworkOffering
-  include Network::Network
-  include Network::PhysicalNetwork
-  include Network::NetworkServiceProvider
-  include Network::StorageIpRange
-  include Network::NetworkDevice
-  include Network::NetworkACL
-  include Network::Vlan
-  include Network::Nat
-  include Network::VPN
-  include Network::LoadBalancer
-  include Network::VPC
+  include CloudstackRubyClient::Network::NetworkOffering
+  include CloudstackRubyClient::Network::Network
+  include CloudstackRubyClient::Network::PhysicalNetwork
+  include CloudstackRubyClient::Network::NetworkServiceProvider
+  include CloudstackRubyClient::Network::StorageIpRange
+  include CloudstackRubyClient::Network::NetworkDevice
+  include CloudstackRubyClient::Network::NetworkACL
+  include CloudstackRubyClient::Network::Vlan
+  include CloudstackRubyClient::Network::Nat
+  include CloudstackRubyClient::Network::VPN
+  include CloudstackRubyClient::Network::LoadBalancer
+  include CloudstackRubyClient::Network::VPC
 
   ## Volume command injection
-  include Volume::Volume
+  include CloudstackRubyClient::Volume::Volume
 
   ## Templdate command injection
-  include Template::Template
-  include Template::ISO
-  include Template::Registration
+  include CloudstackRubyClient::Template::Template
+  include CloudstackRubyClient::Template::ISO
+  include CloudstackRubyClient::Template::Registration
 
   ## Security group command injection
-  include SecurityGroup::SecurityGroup
+  include CloudstackRubyClient::SecurityGroup::SecurityGroup
 
   ## Project command injection
-  include Project::Project
+  include CloudstackRubyClient::Project::Project
 
   ## Snapshot command injection
-  include Snapshot::Snapshot
+  include CloudstackRubyClient::Snapshot::Snapshot
 
   ## Configuraion command injection
-  include Configuration::Configuration
-  include Configuration::Event
+  include CloudstackRubyClient::Configuration::Configuration
+  include CloudstackRubyClient::Configuration::Event
 
   ## Service offering command injection
-  include ServiceOffering::ServiceOffering
-  include ServiceOffering::DiskOffering
+  include CloudstackRubyClient::ServiceOffering::ServiceOffering
+  include CloudstackRubyClient::ServiceOffering::DiskOffering
 
   ## Auto scale command injection
-  include AutoScale::AutoScale
+  include CloudstackRubyClient::AutoScale::AutoScale
+
+  ## Firewall command injection
+  include CloudstackRubyClient::Firewall::Firewall
 
 end