cleanup/fleshing out parsers

lib/fog/terremark.rb

@@ -6,6 +6,8 @@ module Fog
       unless @required
         require 'fog/terremark/parsers/get_catalog'
         require 'fog/terremark/parsers/get_catalog_item'
+        require 'fog/terremark/parsers/get_internet_services'
+        require 'fog/terremark/parsers/get_node_services'
         require 'fog/terremark/parsers/get_organization'
         require 'fog/terremark/parsers/get_organizations'
         require 'fog/terremark/parsers/get_public_ips'
@@ -26,6 +28,8 @@ module Fog
         require 'fog/terremark/requests/deploy_vapp'
         require 'fog/terremark/requests/get_catalog'
         require 'fog/terremark/requests/get_catalog_item'
+        require 'fog/terremark/requests/get_internet_services'
+        require 'fog/terremark/requests/get_node_services'
         require 'fog/terremark/requests/get_organization'
         require 'fog/terremark/requests/get_organizations'
         require 'fog/terremark/requests/get_public_ips'

lib/fog/terremark/parsers/get_internet_services.rb

@@ -1,46 +1,58 @@
 module Fog
   module Parsers
     module Terremark
-      
+
       class GetInternetServices < Fog::Parsers::Base
-        
+
         def reset
           @in_public_ip_address = false
-          @in_internet_service = false
+          @internet_service = {}
-          @response = { 'InternetServices' => [] } #an array of internet services
+          @response = { 'InternetServices' => [] }
         end
-        
+
-        
         def start_element(name, attributes)
           @value = ''
           case name
-            when 'InternetService' #start of a new InternetService:
+          when 'PublicIPAddress'
-            @in_internet_service = true 
-            when 'PublicIPAddress' #start of new IP Address
             @in_public_ip_address = true
           end
         end
-        
+
         def end_element(name)
           case name
-            when 'PublicIPAddress'
+          when 'Description', 'Protocol'
-            @in_public_ip_address = false
+            @internet_service[name] = @value
-            when 'InternetService'
+          when 'Enabled'
-            @in_internet_service = false
+            if @value == 'true'
-            when 'Id', 'Name'
+              @internet_service[name] = true
+            else
+              @internet_service[name] = false
+            end
+          when 'Href', 'Name'
             if @in_public_ip_address
-              @response['InternetServices'].last['PublicIPAddress'][name] = @value
+              @internet_service['PublicIpAddress'] ||= {}
-            elsif @in_internet_service
+              @internet_service['PublicIpAddress'][name] = @value
-              @response['InternetServices'].last[name] = @value
+            else
-            
+              @internet_service[name] = @value
+            end
+          when 'Id'
+            if @in_public_ip_address
+              @internet_service['PublicIpAddress'] ||= {}
+              @internet_service['PublicIpAddress'][name] = @value.to_i
+            else
+              @internet_service[name] = @value.to_i
+            end
+          when 'InternetService'
+            @response['InternetServices'] << @internet_service
+            @internet_service = {}
+          when 'Port', 'Timeout'
+            @internet_service[name] = @value.to_i
+          when 'PublicIPAddress'
+            @in_public_ip_address = false
           end
         end
       end
-      
+
-      
+    end
-      
+  end
-      
+end
-    end #end class
-  end #end Terremark 
-end #end Parsers
-end #end Fog

lib/fog/terremark/parsers/get_node_services.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module Terremark
+
+      class GetNodeServices < Fog::Parsers::Base
+
+        def reset
+          @node_service = {}
+          @response = { 'NodeServices' => [] }
+        end
+
+        def end_element(name)
+          case name
+          when 'Description', 'Href', 'Name', 'IpAddress'
+            @node_service[name] = @value
+          when 'Enabled'
+            if @value == 'true'
+              @node_service[name] = true
+            else
+              @node_service[name] = false
+            end
+          when 'Id', 'Port'
+            @node_service[name] = @value.to_i
+          end
+        end
+
+      end
+
+    end
+  end
+end

lib/fog/terremark/requests/get_internet_services.rb

@@ -8,7 +8,7 @@ module Fog
       #
       # ==== Parameters
       # * vdc_id<~Integer> - Id of vDc to get list of internet services for
-       #
+      #
       # ==== Returns
       # * response<~Excon::Response>:
       #   * body<~Hash>:
@@ -18,9 +18,8 @@ module Fog
       #       * 'PublicIPAddress'<~Hash>
       #       *   'Id'<~String> => id of the public IP
       #       *   'name'<~String> => actual ip address
-      #       
+      #
       def get_internet_services(vdc_id)
- 
         request(
           :expects  => 200,
           :method   => 'GET',

lib/fog/terremark/requests/get_node_services.rb

@@ -2,7 +2,7 @@ module Fog
   module Terremark
     class Real
 
-      require 'fog/terremark/parsers/node_service'
+      require 'fog/terremark/parsers/get_node_services'
 
       # Get a list of all internet services for a vdc
       #