fog 0.0.67 → 0.0.68

data/lib/fog/slicehost.rb

@@ -1,24 +1,25 @@
-require 'fog/slicehost/models/flavor'
-require 'fog/slicehost/models/flavors'
-require 'fog/slicehost/models/image'
-require 'fog/slicehost/models/images'
-require 'fog/slicehost/models/server'
-require 'fog/slicehost/models/servers'
-require 'fog/slicehost/requests/create_slice'
-require 'fog/slicehost/requests/delete_slice'
-require 'fog/slicehost/requests/get_backups'
-require 'fog/slicehost/requests/get_flavor'
-require 'fog/slicehost/requests/get_flavors'
-require 'fog/slicehost/requests/get_image'
-require 'fog/slicehost/requests/get_images'
-require 'fog/slicehost/requests/get_slice'
-require 'fog/slicehost/requests/get_slices'
-require 'fog/slicehost/requests/reboot_slice'
-
 module Fog
   module Slicehost
 
     def self.new(options={})
+
+      require 'fog/slicehost/models/flavor'
+      require 'fog/slicehost/models/flavors'
+      require 'fog/slicehost/models/image'
+      require 'fog/slicehost/models/images'
+      require 'fog/slicehost/models/server'
+      require 'fog/slicehost/models/servers'
+      require 'fog/slicehost/requests/create_slice'
+      require 'fog/slicehost/requests/delete_slice'
+      require 'fog/slicehost/requests/get_backups'
+      require 'fog/slicehost/requests/get_flavor'
+      require 'fog/slicehost/requests/get_flavors'
+      require 'fog/slicehost/requests/get_image'
+      require 'fog/slicehost/requests/get_images'
+      require 'fog/slicehost/requests/get_slice'
+      require 'fog/slicehost/requests/get_slices'
+      require 'fog/slicehost/requests/reboot_slice'
+
       unless options[:slicehost_password]
         raise ArgumentError.new('slicehost_password is required to access slicehost')
       end

data/lib/fog/slicehost/models/flavors.rb

@@ -4,8 +4,16 @@ require 'fog/slicehost/models/flavor'
 module Fog
   module Slicehost
 
-    def flavors
-      Fog::Slicehost::Flavors.new(:connection => self)
+    class Mock
+      def flavors
+        Fog::Slicehost::Flavors.new(:connection => self)
+      end
+    end
+
+    class Real
+      def flavors
+        Fog::Slicehost::Flavors.new(:connection => self)
+      end
     end
 
     class Flavors < Fog::Collection
@@ -14,7 +22,7 @@ module Fog
 
       def all
         data = connection.get_flavors.body['flavors']
-        load(self)
+        load(data)
       end
 
       def get(flavor_id)

data/lib/fog/slicehost/models/images.rb

@@ -4,10 +4,20 @@ require 'fog/slicehost/models/image'
 module Fog
   module Slicehost
 
-    def images(attributes = {})
-      Fog::Slicehost::Images.new({
-        :connection => self
-      }.merge!(attributes))
+    class Mock
+      def images(attributes = {})
+        Fog::Slicehost::Images.new({
+          :connection => self
+        }.merge!(attributes))
+      end
+    end
+
+    class Real
+      def images(attributes = {})
+        Fog::Slicehost::Images.new({
+          :connection => self
+        }.merge!(attributes))
+      end
     end
 
     class Images < Fog::Collection

data/lib/fog/slicehost/models/servers.rb

@@ -4,8 +4,16 @@ require 'fog/slicehost/models/server'
 module Fog
   module Slicehost
 
-    def servers
-      Fog::Slicehost::Servers.new(:connection => self)
+    class Mock
+      def servers
+        Fog::Slicehost::Servers.new(:connection => self)
+      end
+    end
+
+    class Real
+      def servers
+        Fog::Slicehost::Servers.new(:connection => self)
+      end
     end
 
     class Servers < Fog::Collection

data/lib/fog/terremark.rb

@@ -1,24 +1,31 @@
-require 'fog/terremark/requests/delete_vapp'
-require 'fog/terremark/requests/deploy_vapp'
-require 'fog/terremark/requests/get_catalog'
-require 'fog/terremark/requests/get_catalog_item'
-require 'fog/terremark/requests/get_organization'
-require 'fog/terremark/requests/get_organizations'
-require 'fog/terremark/requests/get_task'
-require 'fog/terremark/requests/get_tasks_list'
-require 'fog/terremark/requests/get_vapp'
-require 'fog/terremark/requests/get_vapp_template'
-require 'fog/terremark/requests/get_vdc'
-require 'fog/terremark/requests/instantiate_vapp_template'
-require 'fog/terremark/requests/reset'
-require 'fog/terremark/requests/power_off'
-require 'fog/terremark/requests/power_on'
-require 'fog/terremark/requests/shutdown'
-
 module Fog
   module Terremark
 
     def self.new(options={})
+
+      require 'fog/terremark/requests/add_internet_service'
+      require 'fog/terremark/requests/add_node_service'
+      require 'fog/terremark/requests/create_internet_service'
+      require 'fog/terremark/requests/delete_internet_service'
+      require 'fog/terremark/requests/delete_node_service'
+      require 'fog/terremark/requests/delete_vapp'
+      require 'fog/terremark/requests/deploy_vapp'
+      require 'fog/terremark/requests/get_catalog'
+      require 'fog/terremark/requests/get_catalog_item'
+      require 'fog/terremark/requests/get_organization'
+      require 'fog/terremark/requests/get_organizations'
+      require 'fog/terremark/requests/get_public_ips'
+      require 'fog/terremark/requests/get_task'
+      require 'fog/terremark/requests/get_tasks_list'
+      require 'fog/terremark/requests/get_vapp'
+      require 'fog/terremark/requests/get_vapp_template'
+      require 'fog/terremark/requests/get_vdc'
+      require 'fog/terremark/requests/instantiate_vapp_template'
+      require 'fog/terremark/requests/reset'
+      require 'fog/terremark/requests/power_off'
+      require 'fog/terremark/requests/power_on'
+      require 'fog/terremark/requests/shutdown'
+
       unless options[:terremark_password]
         raise ArgumentError.new('terremark_password is required to access terremark')
       end
@@ -65,6 +72,65 @@ module Fog
         @cookie = get_organizations.headers['Set-Cookie']
       end
 
+      # TODO: bust cache on organization creation?
+      def default_organization_id
+        @default_organization_id ||= begin
+          org_list = get_organizations.body['OrgList']
+          if org_list.length == 1
+            org_list.first['href'].split('/').last.to_i
+          else
+            nil
+          end
+        end
+      end
+
+      def default_vdc_id
+        if default_organization_id
+          @default_vdc_id ||= begin
+            vdcs = get_organization(default_organization_id).body['Links'].select {|link|
+              link['type'] == 'application/vnd.vmware.vcloud.vdc+xml'
+            }
+            if vdcs.length == 1
+              vdcs.first['href'].split('/').last.to_i
+            else
+              nil
+            end
+          end
+        else
+          nil
+        end
+      end
+
+      def default_network_id
+        if default_vdc_id
+          @default_network_id ||= begin
+            networks = get_vdc(default_vdc_id).body['AvailableNetworks']
+            if networks.length == 1
+              networks.first['href'].split('/').last.to_i
+            else
+              nil
+            end
+          end
+        else
+          nil
+        end
+      end
+
+      def default_public_ip_id
+        if default_vdc_id
+          @default_public_ip_id ||= begin
+            ips = get_public_ips(default_vdc_id).body['PublicIpAddresses']
+            if ips.length == 1
+              ips.first['Href'].split('/').last.to_i
+            else
+              nil
+            end
+          end
+        else
+          nil
+        end
+      end
+
       private
 
       def request(params)

data/lib/fog/terremark/parsers/get_public_Ips.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module Terremark
+
+      class GetPublicIps< Fog::Parsers::Base
+
+        def reset
+          @ip_address = {}
+          @response = { 'PublicIpAddresses' => [] }
+        end
+
+        def end_element(name)
+          case name
+          when 'Href', 'Name'
+            @ip_address[name] = @value
+          when 'Id'
+            @ip_address[name] = @value.to_i
+          when 'PublicIPAddress'
+            @response['PublicIpAddresses'] << @ip_address
+            @ip_address = {}
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/parsers/internet_service.rb

@@ -0,0 +1,63 @@
+module Fog
+  module Parsers
+    module Terremark
+
+      class InternetService < Fog::Parsers::Base
+
+        def reset
+          @in_public_ip_address = false
+          @response = { 'PublicIpAddress' => {} }
+        end
+
+        def start_element(name, attributes)
+          @value = ''
+          case name
+          when 'Href'
+            data = {}
+            until attributes.empty?
+              data[attributes.shift] = attributes.shift
+            end
+            if @in_public_ip_address
+              @response['PublicIpAddress'][name] = data
+            else
+              @response[name] = data
+            end
+          when 'PublicIpAddress'
+            @in_public_ip_address = true
+          end
+        end
+
+        def end_element(name)
+          case name
+          when 'Description', 'Protocol'
+            @response[name] = @value
+          when 'Enabled'
+            if @value == 'false'
+              @response[name] = false
+            else
+              @response[name] = true
+            end
+          when 'Id'
+            if @in_public_ip_address
+              @response['PublicIpAddress'][name] = @value.to_i
+            else
+              @response[name] = @value.to_i
+            end
+          when 'Name'
+            if @in_public_ip_address
+              @response['PublicIpAddress'][name] = @value
+            else
+              @response[name] = @value
+            end
+          when 'Port', 'Timeout'
+            @response[name] = @value.to_i
+          when 'PublicIpAddress'
+            @in_public_ip_address = false
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/parsers/node_service.rb

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

data/lib/fog/terremark/requests/add_internet_service.rb

@@ -0,0 +1,63 @@
+module Fog
+  module Terremark
+    class Real
+
+      require 'fog/terremark/parsers/internet_service'
+
+      # Reserve requested resources and deploy vApp
+      #
+      # ==== Parameters
+      # * ip_id<~Integer> - Id of ip to add service to
+      # * name<~String> - Name of service
+      # * protocol<~String> - Protocol of service
+      # * port<~Integer> - Port of service
+      # * options<~Hash>:
+      #   * Enabled<~Boolean>: defaults to true
+      #   * Description<~String>: optional description
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Hash>:
+      #     * 'endTime'<~String> - endTime of task
+      #     * 'href'<~String> - link to task
+      #     * 'startTime'<~String> - startTime of task
+      #     * 'status'<~String> - status of task
+      #     * 'type'<~String> - type of task
+      #     * 'Owner'<~String> -
+      #       * 'href'<~String> - href of owner
+      #       * 'name'<~String> - name of owner
+      #       * 'type'<~String> - type of owner
+      def add_internet_service(ip_id, name, protocol, port, options = {})
+        unless options.has_key?('Enabled')
+          options['Enabled'] = true
+        end
+        data = <<-DATA
+<InternetService xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:tmrk:vCloudExpress-1.0:request:createInternetService">
+  <Name>#{name}</Name>
+  <Protocol>#{protocol.upcase}</Protocol>
+  <Port>#{port}</Port>
+  <Enabled>#{options['Enabled']}</Enabled>
+  <Description>#{options['Description']}</Description>
+</InternetService>
+DATA
+        request(
+          :body     => data,
+          :expects  => 200,
+          :headers  => {'Content-Type' => 'application/xml'},
+          :method   => 'POST',
+          :parser   => Fog::Parsers::Terremark::InternetService.new,
+          :path     => "publicIps/#{ip_id}/internetServices"
+        )
+      end
+
+    end
+
+    class Mock
+
+      def add_internet_service(ip_id)
+        raise MockNotImplemented.new("Contributions welcome!")
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/requests/add_node_service.rb

@@ -0,0 +1,63 @@
+module Fog
+  module Terremark
+    class Real
+
+      require 'fog/terremark/parsers/node_service'
+
+      # Reserve requested resources and deploy vApp
+      #
+      # ==== Parameters
+      # * service_id<~String> - Id of service to add node to
+      # * ip<~String> - Private ip of server to add to node
+      # * name<~String> - Name of service
+      # * port<~Integer> - Port of service
+      # * options<~Hash>:
+      #   * Enabled<~Boolean>: defaults to true
+      #   * Description<~String>: optional description
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Hash>:
+      #     * 'endTime'<~String> - endTime of task
+      #     * 'href'<~String> - link to task
+      #     * 'startTime'<~String> - startTime of task
+      #     * 'status'<~String> - status of task
+      #     * 'type'<~String> - type of task
+      #     * 'Owner'<~String> -
+      #       * 'href'<~String> - href of owner
+      #       * 'name'<~String> - name of owner
+      #       * 'type'<~String> - type of owner
+      def add_node_service(service_id, ip, name, port, options = {})
+        unless options.has_key?('Enabled')
+          options['Enabled'] = true
+        end
+        data = <<-DATA
+<NodeService xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:tmrk:vCloudExpress-1.0:request:createNodeService">
+  <IpAddress>#{ip}</IpAddress>
+  <Name>#{name}</Name>
+  <Port>#{port}</Port>
+  <Enabled>#{options['Enabled']}</Enabled>
+  <Description>#{options['Description']}</Description>
+</NodeService>
+DATA
+        request(
+          :body     => data,
+          :expects  => 200,
+          :headers  => {'Content-Type' => 'application/xml'},
+          :method   => 'POST',
+          :parser   => Fog::Parsers::Terremark::InternetService.new,
+          :path     => "internetServices/#{service_id}/nodes"
+        )
+      end
+
+    end
+
+    class Mock
+
+      def add_node_service(ip)
+        raise MockNotImplemented.new("Contributions welcome!")
+      end
+
+    end
+  end
+end