fog 1.5.0 → 1.6.0

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

@@ -0,0 +1,67 @@
+require 'fog/core/model'
+
+module Fog
+  module Terremark
+    module Shared
+
+      class InternetService < Fog::Model
+
+        identity :Id
+
+        attribute :Name
+        attribute :Port
+        attribute :Protocol
+        attribute :Description
+        attribute :PublicIpAddress
+        attribute :public_ip_address_id
+
+        def destroy(delete_public_ip=true)
+          connection.delete_internet_service(self.Id)
+          connection.delete_public_ip(self.PublicIpAddress["Id"]) if delete_public_ip
+        true
+        end
+
+        def save
+          requires :Name, :Protocol, :Port
+          if not public_ip_address_id
+            #Create the first internet service and allocate public IP
+            data = connection.create_internet_service(
+                vdc = connection.default_vdc_id,
+                name = self.Name,
+                protocol = self.Protocol,
+                port = self.Port,
+                options = {
+                        'Enabled' => 'true',
+                        "Description" => self.Name
+                }
+            )
+          else
+            #create additional services to existing Public IP
+            data = connection.add_internet_service(
+                      ip_id = public_ip_address_id,
+                      name = self.Name,
+                      protocol = self.Protocol,
+                      port = self.Port,
+                      options = {
+                        'Enabled' => 'true',
+                        "Description" => self.Name
+                        }
+                    )           
+            end
+            merge_attributes(data.body)
+            true
+        end
+        private
+
+        def href=(new_href)
+          self.id = new_href.split('/').last.to_i
+        end
+
+        def type=(new_type); @type = new_type; end
+        def size=(new_size); @size = new_size; end
+        def Links=(new_links); @Links = new_links; end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'fog/core/collection'
+require 'fog/terremark/models/shared/internetservice'
+
+module Fog
+  module Terremark
+    module Shared
+
+      module Mock
+        def internetservices(options = {})
+          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+        end
+      end
+
+      module Real
+        def internetservices(options = {})
+          Fog::Terremark::Shared::InternetServices.new(options.merge(:connection => self))
+        end
+      end
+
+      class InternetServices < Fog::Collection
+
+        model Fog::Terremark::Shared::InternetService
+
+        def all
+          data = connection.get_internet_services(vdc_id).body["InternetServices"]
+          load(data)
+        end
+
+        def get(service_id)
+          data = connection.get_internet_services(vdc_id)
+          internet_service = services.body["InternetServices"].select {|item| item["Id"] == service_id}
+          new(internetservice)
+        end
+
+        def vdc_id
+          @vdc_id ||= connection.default_vdc_id
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+require 'fog/core/model'
+
+module Fog
+  module Terremark
+    module Shared
+
+      class NodeService < Fog::Model
+
+        identity :Id
+        attribute :Name
+        attribute :Href
+        attribute :Port
+        attribute :Description
+        attribute :IpAddress
+        attribute :Enabled
+        attribute :InternetServiceId
+
+        def destroy
+          connection.delete_node_service(self.Id)
+        end
+
+        def save
+         requires :Name, :Port, :InternetServiceId
+            data = connection.add_node_service(
+                service_id = self.InternetServiceId,
+                ip = self.IpAddress,
+                name = self.Name,
+                port = self.Port,
+                options = {"Enabled" => 'true',
+                           "Description" => self.Name,
+                }
+            
+            )
+            merge_attributes(data.body)
+            true
+        end
+
+        private
+
+        def href=(new_href)
+          self.id = new_href.split('/').last.to_i
+        end
+
+        def type=(new_type); @type = new_type; end
+        def size=(new_size); @size = new_size; end
+        def Links=(new_links); @Links = new_links; end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'fog/core/collection'
+require 'fog/terremark/models/shared/nodeservice'
+
+module Fog
+  module Terremark
+    module Shared
+
+      module Mock
+        def nodeservices(options = {})
+          Fog::Terremark::Shared::Servers.new(options.merge(:connection => self))
+        end
+      end
+
+      module Real
+        def nodeservices(options = {})
+          Fog::Terremark::Shared::NodeServices.new(options.merge(:connection => self))
+        end
+      end
+
+      class NodeServices < Fog::Collection
+
+        model Fog::Terremark::Shared::NodeService
+        
+        def all(internet_service_id)
+          data = connection.get_node_services(internet_service_id).body["NodeServices"]
+          load(data)
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,4 +1,15 @@
 require 'fog/core/model'
+require 'fog/terremark/models/shared/nodeservices'
+require 'fog/terremark/models/shared/internetservices'
+
+# { '0' => 'Being created', '1' => 'Being Deployed, '2' => 'Powered Off', '4' => 'Powered On'}
+module VAppStatus
+  BEING_CREATED = "0"
+  BEING_DEPLOYED = "1"
+  POWERED_OFF = "2"
+  POWERED_ON = "4"
+end
+
 
 module Fog
   module Terremark
@@ -9,30 +20,68 @@ module Fog
         identity :id
 
         attribute :name
+        attribute :image
+        attribute :vcpus
+        attribute :memory
+        attribute :sshkeyFingerPrint
+        attribute :powerOn
         attribute :status
         attribute :OperatingSystem
         attribute :VirtualHardware
+        attribute :IpAddress
 
+        def reload
+         merge_attributes(connection.get_vapp(id).body)
+        end
         def destroy
-          requires :id
-          data = connection.power_off(id).body
-          task = connection.tasks.new(data)
-          task.wait_for { ready? }
-          connection.delete_vapp(id)
+          case self.status
+            when VAppStatus::BEING_CREATED, VAppStatus::BEING_DEPLOYED
+              return false
+            when VAppStatus::POWERED_ON
+              data = connection.power_off(self.id).body
+              wait_for { off? }
+            end
+          connection.delete_vapp(self.id)
           true
         end
 
+        def PublicIpAddress
+          @PublicIpAddress ||=
+            if internet_services.size > 0
+              internet_services[0].PublicIpAddress["Name"]
+            end
+          @PublicIpAddress
+        end
+
+        def internet_services
+            @internet_services ||= connection.internetservices.all.select {|item| item.Name == self.name}
+        end
+        
+        def delete_internet_services
+            #Find the internet service
+
+            while (service = internet_services.pop) do
+
+              nodes = connection.nodeservices.all(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))
+            end
+            true
+        end
+
         # { '0' => 'Being created', '2' => 'Powered Off', '4' => 'Powered On'}
         def ready?
-          status == '2'
+          status == VAppStatus::POWERED_OFF
         end
 
         def on?
-          status == '4'
+          status == VAppStatus::POWERED_ON
         end
 
         def off?
-          status == '2'
+          status == VAppStatus::POWERED_OFF
         end
 
         def power_on(options = {})
@@ -81,14 +130,66 @@ module Fog
           power_on
         end
 
+        def create_internet_services(internet_spec)
+          public_ip_info = nil
+          internet_service_id = nil
+          internet_spec.each do |proto, ports|
+            for port in ports
+              if not public_ip_info
+                #Create the first internet service and allocate public IP
+                inet_services = connection.internetservices.create({
+                      "Name" => self.name,
+                      "Protocol" => proto,
+                      "Port" => port,
+                })
+                internet_service_id = inet_services.Id
+                public_ip_info = inet_services.PublicIpAddress
+
+              else
+                #create additional services to existing Public IP
+                inet_services = connection.internetservices.create({
+                      "public_ip_address_id" => public_ip_info["Id"],                      
+                      "Name" => self.name,
+                      "Protocol" => proto,
+                      "Port" => port,
+                }
+                    )
+                internet_service_id = inet_services.Id
+              end
+
+              #Create the associate node service to the server
+              connection.nodeservices.create({"Name" => self.name, 
+                                           "IpAddress" => self.IpAddress,
+                                           "Port" => port,
+                                           "InternetServiceId" => internet_service_id
+              })
+            end
+          end
+          true
+        end
+
         def save
           requires :name
-          data = connection.instantiate_vapp(name)
+          if powerOn
+          end
+          data = connection.instantiate_vapp_template(
+              server_name=name, 
+              vapp_template=image, 
+              options={
+                  'ssh_key_fingerprint' => sshkeyFingerPrint,
+                  'cpus' => vcpus,
+                  'memory' => memory
+              })
+
           merge_attributes(data.body)
-          task = connection.deploy_vapp(id)
-          task.wait_for { ready? }
-          task = connection.power_on(id)
-          task.wait_for { ready? }
+          wait_for { ready? }
+
+          #Optional, incase further configuration required.
+          if powerOn
+            power_on
+            wait_for { ready? }
+          end
+
           true
         end
 
@@ -100,11 +201,9 @@ module Fog
 
         def type=(new_type); @type = new_type; end
         def size=(new_size); @size = new_size; end
-        def IpAddress=(new_ipaddress); @IpAddress = new_ipaddress; end
         def Links=(new_links); @Links = new_links; end
 
       end
-
     end
   end
 end

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

@@ -22,20 +22,19 @@ module Fog
         model Fog::Terremark::Shared::Server
 
         def all
-          data = connection.get_vdc(vdc_id).body['ResourceEntities'].select do |entity|
-            entity['type'] == 'application/vnd.vmware.vcloud.vApp+xml'
+          data = []
+          connection.get_vdc(vdc_id).body['ResourceEntities'].select do |entity|
+              data << connection.servers.get(entity["href"].split('/').last)
           end
-          load(data)
+          data
         end
 
         def get(server_id)
-          if server_id && server = connection.get_vapp(server_id).body
-            new(server)
-          elsif !server_id
+          if server_id
+            new(connection.get_vapp(server_id).body)
+          else
             nil
           end
-        rescue Excon::Errors::Forbidden
-          nil
         end
 
         def vdc_id

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

@@ -9,7 +9,9 @@ module Fog
         identity :id
 
         attribute :name
-
+        attribute :ResourceEntities
+        attribute :AvailableNetworks
+        attribute :links
         def networks
           connection.networks(:vdc_id => id)
         end
@@ -22,6 +24,9 @@ module Fog
           connection.servers(:vdc_id => id)
         end
 
+        def images
+          connection.images(:vdc_id => id)
+        end
         private
 
         def href=(new_href)

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

@@ -14,8 +14,13 @@ module Fog
             case name
             when 'CatalogItem'
               catalog_item = {}
-              until attributes.empty?
-                catalog_item[attributes.shift] = attributes.shift
+              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            
               @response['CatalogItems'] << catalog_item
             when 'Catalog'

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

@@ -0,0 +1,56 @@
+
+module Fog
+  module Parsers
+    module Terremark
+      module Shared
+
+        class GetKeysList < Fog::Parsers::Base
+
+          def reset
+            @response = { 'Keys' => [] }
+            @key = {}
+          end
+
+          def start_element(name, attributes)
+            super
+            case name
+            when 'Id', 'Href', 'Name', 'IsDefault','FingerPrint'
+              data = {}
+              until attributes.empty?
+                data[attributes.shift] = attributes.shift
+              end
+              @key[name] = data
+            when 'Key'
+              until attributes.empty?
+                @key[attributes.shift] = attributes.shift
+              end
+            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
+              @response['href'] = keys_list['href']
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Id', 'Href', 'Name', 'IsDefault','FingerPrint'
+            @key[name] = value
+            when 'Key'
+              @response['Keys'] << @key
+              @key = {}
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end