fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

data/lib/fog/storm_on_demand/storage.rb

@@ -0,0 +1,69 @@
+require "fog/storm_on_demand"
+require "fog/storage"
+require "fog/storm_on_demand/shared"
+
+module Fog
+  module Storage
+    class StormOnDemand < Fog::Service
+
+      API_URL = 'https://api.stormondemand.com'
+      API_VERSION = 'v1'
+
+      requires :storm_on_demand_username, :storm_on_demand_password
+      recognizes :storm_on_demand_auth_url
+
+      model_path 'fog/storm_on_demand/models/storage'
+      model       :cluster
+      collection  :clusters
+      model       :volume
+      collection  :volumes
+
+      request_path 'fog/storm_on_demand/requests/storage'
+      request :list_clusters
+      request :attach_volume_to_server
+      request :create_volume
+      request :delete_volume
+      request :detach_volume_from_server
+      request :get_volume
+      request :list_volumes
+      request :resize_volume
+      request :update_volume
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @storm_on_demand_username = options[:storm_on_demand_username]
+        end
+
+        def data
+          self.class.data[@storm_on_demand_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@storm_on_demand_username)
+        end
+
+      end
+
+      class Real
+
+        include Fog::StormOnDemand::RealShared
+
+      end
+    end
+  end
+end

data/lib/fog/storm_on_demand/support.rb

@@ -0,0 +1,68 @@
+require 'fog/storm_on_demand'
+require 'fog/support'
+require 'fog/storm_on_demand/shared'
+
+module Fog
+  module Support
+
+    class StormOnDemand < Fog::Service
+
+      requires :storm_on_demand_username, :storm_on_demand_password
+      recognizes :storm_on_demand_auth_url
+
+      model_path 'fog/storm_on_demand/models/support'
+      model       :alert
+      collection  :alerts
+      model       :ticket
+      collection  :tickets
+
+      request_path 'fog/storm_on_demand/requests/support'
+      request :get_active_alert
+      request :add_feedback
+      request :add_transaction_feedback
+      request :authenticate
+      request :close_ticket
+      request :create_ticket
+      request :get_ticket_details
+      request :list_tickets
+      request :reply_ticket
+      request :list_ticket_types
+      
+      class Mock
+
+        def self.data
+          @data ||= Hash.new
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @storm_on_demand_username = options[:storm_on_demand_username]
+        end
+
+        def data
+          self.class.data[@storm_on_demand_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@storm_on_demand_username)
+        end
+
+      end
+
+      class Real
+
+        include Fog::StormOnDemand::RealShared
+
+      end
+    end
+  end
+end

data/lib/fog/storm_on_demand/vpn.rb

@@ -0,0 +1,58 @@
+require 'fog/storm_on_demand'
+require 'fog/storm_on_demand/shared'
+require 'fog/vpn'
+
+module Fog
+  module VPN
+    class StormOnDemand < Fog::Service
+      requires :storm_on_demand_username, :storm_on_demand_password
+      recognizes :storm_on_demand_auth_url
+
+      model_path 'fog/storm_on_demand/models/vpn'
+      model       :vpn
+      collection  :vpns
+
+      request_path 'fog/storm_on_demand/requests/vpn'
+      request :create_vpn
+      request :get_vpn
+      request :list_vpn_users
+      request :update_vpn
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @storm_on_demand_username = options[:storm_on_demand_username]
+        end
+
+        def data
+          self.class.data[@storm_on_demand_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@storm_on_demand_username)
+        end
+
+      end
+
+      class Real
+
+        include Fog::StormOnDemand::RealShared
+
+      end
+    end
+  end
+end

data/lib/fog/support.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Support
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+
+      if provider == :stormondemand
+        require 'fog/storm_on_demand/support'
+        Fog::Support::StormOnDemand.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no support service")
+      end
+
+    end
+
+    def self.providers
+      Fog.services[:support]
+    end
+
+  end
+end

data/lib/fog/terremark/models/shared/server.rb

@@ -41,6 +41,8 @@ module Fog
               data = service.power_off(self.id).body
               wait_for { off? }
             end
+            #Failsafe .. Always check if we are ready
+          wait_for { ready? }
           service.delete_vapp(self.id)
           true
         end
@@ -60,13 +62,13 @@ module Fog
         def delete_internet_services
             #Find the internet service
 
-            while (service = internet_services.pop) do
+            while (inet_service = internet_services.pop) do
 
-              nodes = service.nodeservices.all(service.Id)
+              nodes = service.nodeservices.all(inet_service.Id)
               #Delete all the associated nodes
               nodes.select { |item| item.destroy }
               #Clear out the services
-              service.destroy(delete_public_ip = !(internet_services.size > 0))
+              inet_service.destroy(delete_public_ip = !(internet_services.size > 0))
             end
             true
         end

data/lib/fog/terremark/parser.rb

@@ -1,19 +1,20 @@
-module Fog
-  module Terremark
-    module Shared
-      module Parser
 
-        remove_method :parse
-        def parse(data)
-          case data['type']
-          when 'application/vnd.vmware.vcloud.vApp+xml'
-            servers.new(data.merge!(:service => self))
-          else
-            data
-          end
-        end
+class TerremarkParser < Fog::Parsers::Base
 
+  def extract_attributes(attributes_xml)
+    attributes = {}
+    until attributes_xml.empty?
+      if attributes_xml.first.is_a?(Array)
+        until attributes_xml.first.empty?
+          attribute = attributes_xml.first.shift
+          attributes[attribute.localname] = attribute.value
+        end
+      else
+        attribute = attributes_xml.shift
+        attributes[attribute.localname] = attribute.value
       end
     end
+    attributes
   end
 end
+

data/lib/fog/terremark/parsers/shared/get_catalog.rb

@@ -3,7 +3,7 @@ module Fog
     module Terremark
       module Shared
 
-        class GetCatalog < Fog::Parsers::Base
+        class GetCatalog < TerremarkParser
 
           def reset
             @response = { 'CatalogItems' => [] }
@@ -13,26 +13,12 @@ module Fog
             super
             case name
             when 'CatalogItem'
-              catalog_item = {}
-              attributes.each do |attrib|
-                i = 0
-                while i < attrib.size
-                  catalog_item[attrib[i]] = attrib[i+1]
-                  i += 2
-                end
-                catalog_item["id"] = catalog_item["href"].split('/').last
-              end            
+              catalog_item = extract_attributes(attributes)
+              catalog_item["id"] = catalog_item["href"].split('/').last
               @response['CatalogItems'] << catalog_item
+
             when 'Catalog'
-              catalog = {}
-              until attributes.empty?
-                if attributes.first.is_a?(Array)
-                  attribute = attributes.shift
-                  catalog[attribute.first] = attribute.last
-                else
-                  catalog[attributes.shift] = attributes.shift
-                end
-              end
+              catalog = extract_attributes(attributes)
               @response['name'] = catalog['name']
             end
           end

data/lib/fog/terremark/parsers/shared/get_catalog_item.rb

@@ -3,7 +3,7 @@ module Fog
     module Terremark
       module Shared
 
-        class GetCatalogItem < Fog::Parsers::Base
+        class GetCatalogItem < TerremarkParser
 
           def reset
             @response = { 'Entity' => {}, 'Properties' => {} }
@@ -13,22 +13,12 @@ module Fog
             super
             case name
             when 'Entity'
-              until attributes.empty?
-                @response['Entity'][attributes.shift] = attributes.shift
-              end
+              @response['Entity'] = extract_attributes(attributes)
             when 'CatalogItem'
-              catalog_item = {}
-              until attributes.empty?
-                if attributes.first.is_a?(Array)
-                  attribute = attributes.shift
-                  catalog_item[attribute.first] = attribute.last
-                else
-                  catalog_item[attributes.shift] = attributes.shift
-                end
-              end
+              catalog_item = extract_attributes(attributes)
               @response['name'] = catalog_item['name']
             when 'Property'
-              @property_key = attributes.last
+              @property_key = attributes.value
             end
           end
 

data/lib/fog/terremark/parsers/shared/get_internet_services.rb

@@ -3,7 +3,7 @@ module Fog
     module Terremark
       module Shared
 
-        class GetInternetServices < Fog::Parsers::Base
+        class GetInternetServices < TerremarkParser
 
           def reset
             @in_public_ip_address = false

data/lib/fog/terremark/parsers/shared/get_keys_list.rb

@@ -4,8 +4,7 @@ module Fog
     module Terremark
       module Shared
 
-        class GetKeysList < Fog::Parsers::Base
-
+        class GetKeysList < TerremarkParser
           def reset
             @response = { 'Keys' => [] }
             @key = {}
@@ -15,25 +14,12 @@ module Fog
             super
             case name
             when 'Id', 'Href', 'Name', 'IsDefault','FingerPrint'
-              data = {}
-              until attributes.empty?
-                data[attributes.shift] = attributes.shift
-              end
+              data = extract_attributes(attributes)
               @key[name] = data
             when 'Key'
-              until attributes.empty?
-                @key[attributes.shift] = attributes.shift
-              end
+              @key = extract_attributes(attributes)
             when 'Keys'
-              keys_list = {}
-              until attributes.empty?
-                if attributes.first.is_a?(Array)
-                  attribute = attributes.shift
-                  keys_list[attribute.first] = attribute.last
-                else
-                  keys_list[attributes.shift] = attributes.shift
-                end
-              end
+              keys_list = extract_attributes(attributes)
               @response['href'] = keys_list['href']
             end
           end

data/lib/fog/terremark/parsers/shared/get_network_ips.rb

@@ -3,7 +3,7 @@ module Fog
     module Terremark
       module Shared
 
-        class GetNetworkIps< Fog::Parsers::Base
+        class GetNetworkIps< TerremarkParser
 
           def reset
             @ip_address = {}

data/lib/fog/terremark/parsers/shared/get_node_services.rb

@@ -3,7 +3,7 @@ module Fog
     module Terremark
       module Shared
 
-        class GetNodeServices < Fog::Parsers::Base
+        class GetNodeServices < TerremarkParser
 
           def reset
             @node_service = {}

data/lib/fog/terremark/parsers/shared/get_organization.rb

@@ -3,7 +3,8 @@ module Fog
     module Terremark
       module Shared
 
-        class GetOrganization < Fog::Parsers::Base
+        class GetOrganization < TerremarkParser
+          # include Fog::Terremark::Shared::Parser
 
           def reset
             @response = { 'Links' => [] }
@@ -13,7 +14,7 @@ module Fog
             super
             case name
             when 'Link'
-              link = {}
+              link = extract_attributes(attributes)
               until attributes.empty?
                 if attributes.first.is_a?(Array)
                   attribute = attributes.shift
@@ -24,7 +25,7 @@ module Fog
               end
               @response['Links'] << link
             when 'Org'
-              org = {}
+              org = extract_attributes(attributes)
               until attributes.empty?
                 if attributes.first.is_a?(Array)
                   attribute = attributes.shift