fog 0.0.67 → 0.0.68

data/lib/fog/terremark/requests/create_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
+      # * vdc_id<~Integer> - Id of vDc to add internet 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 create_internet_service(vdc_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     => "vdc/#{vdc_id}/internetServices"
+        )
+      end
+
+    end
+
+    class Mock
+
+      def create_internet_service(vdc_id)
+        raise MockNotImplemented.new("Contributions welcome!")
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Fog
+  module Terremark
+    class Real
+
+      # Destroy an internet service
+      #
+      # ==== Parameters
+      # * internet_service_id<~Integer> - Id of service to destroy
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Hash>:
+
+      # FIXME
+
+      #     * 'CatalogItems'<~Array>
+      #       * 'href'<~String> - linke to item
+      #       * 'name'<~String> - name of item
+      #       * 'type'<~String> - type of item
+      #     * 'description'<~String> - Description of catalog
+      #     * 'name'<~String> - Name of catalog
+      def delete_internet_service(internet_service_id)
+        request(
+          :expects  => 200,
+          :method   => 'DELETE',
+          :path     => "InternetServices/#{internet_service_id}"
+        )
+      end
+
+    end
+
+    class Mock
+
+      def delete_internet_service(internet_service_id)
+        raise MockNotImplemented.new("Contributions welcome!")
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Fog
+  module Terremark
+    class Real
+
+      # Destroy a node
+      #
+      # ==== Parameters
+      # * node_service_id<~Integer> - Id of node to destroy
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Hash>:
+
+      # FIXME
+
+      #     * 'CatalogItems'<~Array>
+      #       * 'href'<~String> - linke to item
+      #       * 'name'<~String> - name of item
+      #       * 'type'<~String> - type of item
+      #     * 'description'<~String> - Description of catalog
+      #     * 'name'<~String> - Name of catalog
+      def delete_node_service(node_service_id)
+        request(
+          :expects  => 200,
+          :method   => 'DELETE',
+          :path     => "nodeServices/#{node_service_id}"
+        )
+      end
+
+    end
+
+    class Mock
+
+      def delete_node_service(node_id)
+        raise MockNotImplemented.new("Contributions welcome!")
+      end
+
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ module Fog
           :expects  => 202,
           :method   => 'POST',
           :parser   => Fog::Parsers::Terremark::Task.new,
-          :path     => "/vApp/#{vapp_id}/action/deploy"
+          :path     => "vApp/#{vapp_id}/action/deploy"
         )
       end
 
@@ -34,7 +34,7 @@ module Fog
 
     class Mock
 
-      def deploy_vapp(task_id)
+      def deploy_vapp(vapp_id)
         raise MockNotImplemented.new("Contributions welcome!")
       end
 

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

@@ -0,0 +1,37 @@
+module Fog
+  module Terremark
+    class Real
+
+      require 'fog/terremark/parsers/get_public_ips'
+
+      # Get list of public ips
+      #
+      # ==== Parameters
+      # * vdc_id<~Integer> - Id of vdc to find public ips for
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Hash>:
+      #     * 'PublicIpAddresses'<~Array>
+      #       * 'href'<~String> - linke to item
+      #       * 'name'<~String> - name of item
+      def get_public_ips(vdc_id)
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :parser   => Fog::Parsers::Terremark::GetPublicIps.new,
+          :path     => "vdc/#{vdc_id}/publicIps"
+        )
+      end
+
+    end
+
+    class Mock
+
+      def get_public_ips(vdc_id)
+        raise MockNotImplemented.new("Contributions welcome!")
+      end
+
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module Fog
           :expects  => 200,
           :method   => 'GET',
           :parser   => Fog::Parsers::Terremark::Task.new,
-          :path     => "/task/#{task_id}"
+          :path     => "task/#{task_id}"
         )
       end
 

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

@@ -23,7 +23,7 @@ module Fog
           :expects  => 200,
           :method   => 'GET',
           :parser   => Fog::Parsers::Terremark::GetTasksList.new,
-          :path     => "/tasksList/#{tasks_list_id}"
+          :path     => "tasksList/#{tasks_list_id}"
         )
       end
 

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

@@ -33,7 +33,7 @@ module Fog
           :expects  => 200,
           :method   => 'GET',
           :parser   => Fog::Parsers::Terremark::Vapp.new,
-          :path     => "/vapp/#{vapp_id}"
+          :path     => "vapp/#{vapp_id}"
         )
       end
 

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

@@ -23,13 +23,9 @@ module Fog
       #     * 'name'<~String> - Name of catalog
       def instantiate_vapp_template(name)
         # FIXME: much cheating to commence
-
-        organization_id = get_organizations.body['OrgList'].first['href'].split('/').last
-        organization = get_organization(organization_id).body
-        vdc_id = organization['Links'].select {|link| link['type'] == 'application/vnd.vmware.vcloud.vdc+xml'}.first['href'].split('/').last
-        vdc = get_vdc(vdc_id).body
-        network_id = vdc['AvailableNetworks'].first['href'].split('/').last
-        catalog_item = 12 # Ubuntu JeOS 9.10 (64-bit)
+        vdc_id        = default_vdc_id
+        network_id    = default_network_id
+        catalog_item  = 12 # Ubuntu JeOS 9.10 (64-bit)
 
         #       case UNRESOLVED:
         #          return "0";
@@ -101,7 +97,7 @@ DATA
           :headers  => { 'Content-Type' => 'application/vnd.vmware.vcloud.instantiateVAppTemplateParams+xml' },
           :method   => 'POST',
           :parser   => Fog::Parsers::Terremark::InstantiateVappTemplate.new,
-          :path     => "/vdc/#{vdc_id}/action/instantiatevAppTemplate"
+          :path     => "vdc/#{vdc_id}/action/instantiatevAppTemplate"
         )
       end
 

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

@@ -26,7 +26,7 @@ module Fog
           :expects  => 202,
           :method   => 'POST',
           :parser   => Fog::Parsers::Terremark::Task.new,
-          :path     => "/vApp/#{vapp_id}/power/action/powerOff"
+          :path     => "vApp/#{vapp_id}/power/action/powerOff"
         )
       end
 

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

@@ -26,7 +26,7 @@ module Fog
           :expects  => 202,
           :method   => 'POST',
           :parser   => Fog::Parsers::Terremark::Task.new,
-          :path     => "/vApp/#{vapp_id}/power/action/powerOn"
+          :path     => "vApp/#{vapp_id}/power/action/powerOn"
         )
       end
 

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

@@ -26,7 +26,7 @@ module Fog
           :expects  => 202,
           :method   => 'POST',
           :parser   => Fog::Parsers::Terremark::Task.new,
-          :path     => "/vApp/#{vapp_id}/power/action/reset"
+          :path     => "vApp/#{vapp_id}/power/action/reset"
         )
       end
 

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

@@ -26,7 +26,7 @@ module Fog
           :expects  => 202,
           :method   => 'POST',
           :parser   => Fog::Parsers::Terremark::Task.new,
-          :path     => "/vApp/#{vapp_id}/power/action/shutdown"
+          :path     => "vApp/#{vapp_id}/power/action/shutdown"
         )
       end
 

data/tests/{test_helper.rb → helper.rb}

@@ -1,8 +1,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog', 'bin'))
 
-# TODO: Currently is true even if some of the keys in format do not appear in 
-def validate_data_format(original_data, format)
+# TODO: Currently is true even if some of the keys in format do not appear
+def validate_format(original_data, format)
   valid = true
   data = original_data.dup
   for key, value in format
@@ -14,22 +14,23 @@ def validate_data_format(original_data, format)
       for element in datum
         type = value.first
         if type.is_a?(Hash)
-          valid &&= validate_data_format({:element => element}, {:element => type})
+          valid &&= validate_format({:element => element}, {:element => type})
         else
           valid &&= element.is_a?(type)
         end
       end
     when Hash
       valid &&= datum.is_a?(Hash)
-      valid &&= validate_data_format(datum, value)
+      valid &&= validate_format(datum, value)
     else
       valid &&= datum.is_a?(value)
     end
   end
-  unless data.empty?
-    p "validate_data_format did not validate [#{data.inspect}]"
-  end
   valid &&= data.empty?
+  unless valid
+    @formatador.display_line("[red]#{original_data.inspect} does not match #{format.inspect}[/]")
+  end
+  valid
 end
 
 def wait_for(timeout = 600, &block)

data/tests/{test_helper_tests.rb → helper_tests.rb}

@@ -1,20 +1,18 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
-
-Shindo.tests('test_helper') do
+Shindo.tests('test_helper', 'meta') do
   tests('#validate_data_format') do
 
     tests('returns true') do
 
       test('when format of value matches') do
-        validate_data_format({:a => :b}, {:a => Symbol})
+        validate_format({:a => :b}, {:a => Symbol})
       end
 
       test('when format of nested array elements matches') do
-        validate_data_format({:a => [:b, :c]}, {:a => [Symbol]})
+        validate_format({:a => [:b, :c]}, {:a => [Symbol]})
       end
 
       test('when format of nested hash matches') do
-        validate_data_format({:a => {:b => :c}}, {:a => {:b => Symbol}})
+        validate_format({:a => {:b => :c}}, {:a => {:b => Symbol}})
       end
 
     end
@@ -22,15 +20,15 @@ Shindo.tests('test_helper') do
     tests('returns false') do
 
       test('when format of value does not match') do
-        !validate_data_format({:a => :b}, {:a => String})
+        !validate_format({:a => :b}, {:a => String})
       end
 
       test('when not all keys are checked') do
-        !validate_data_format({:a => :b}, {})
+        !validate_format({:a => :b}, {})
       end
 
       test('when some keys do not appear') do
-        !validate_data_format({}, {:a => String})
+        !validate_format({}, {:a => String})
       end
 
     end

data/tests/rackspace/helper.rb

@@ -0,0 +1,64 @@
+module Rackspace
+
+  def self.[](service)
+    @@connections ||= Hash.new do |hash, key|
+      credentials = Fog.credentials.reject do |k, v|
+        ![:rackspace_api_key, :rackspace_username].include?(k)
+      end
+      hash[key] = case key
+      when :files
+        Fog::Rackspace::Files.new(credentials)
+      when :servers
+        Fog::Rackspace::Servers.new(credentials)
+      end
+    end
+    @@connections[service]
+  end
+
+  module Files
+
+    module Formats
+
+    end
+
+  end
+
+  module Servers
+
+    module Formats
+
+      FLAVOR = {
+        'disk'  => Integer,
+        'id'    => Integer,
+        'name'  => String,
+        'ram'   => Integer
+      }
+
+      IMAGE = {
+        'id'        => Integer,
+        'name'      => String,
+        'serverId'  => Integer,
+        'status'    => String,
+        'updated'   => String
+      }
+
+      SERVER = {
+        'addresses' => {
+          'private' => [String],
+          'public'  => [String]
+        },
+        'flavorId'  => Integer,
+        'hostId'    => String,
+        'id'        => Integer,
+        'imageId'   => Integer,
+        'metadata'  => {},
+        'name'      => String,
+        'progress'  => Integer,
+        'status'    => String
+      }
+
+    end
+
+  end
+
+end