fog 0.1.5 → 0.1.6

data/lib/fog/vcloud/model.rb

@@ -35,7 +35,8 @@ module Fog
       end
 
       def merge_get_raw_result(data)
-        data.body.each_pair do |key,value|
+        #data.body.each_pair do |key,value|
+        (data.respond_to?(:body) ? data.body : data).each_pair do |key,value|
           if aliased_key = self.class.aliases[key]
             send("#{aliased_key}=", value)
           else

data/lib/fog/vcloud/parser.rb

@@ -1,6 +1,11 @@
 module Fog
   module Parsers
     module Vcloud
+
+      def self.de_camel(str)
+        str.gsub(/(.)([A-Z])/,'\1_\2').downcase
+      end
+
       class Base < Fog::Parsers::Base
 
         private

data/lib/fog/vcloud/requests/get_vdc.rb

@@ -20,12 +20,12 @@ module Fog
       #vCloud API Guide v0.9 - Page 27
 
       def get_vdc(vdc_uri)
-        if vdc = DATA[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| URI.parse(vdc[:href]) == vdc_uri }
+        if vdc = Fog::Vcloud::Mock.data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| URI.parse(vdc[:href]) == vdc_uri }
           xml = Builder::XmlMarkup.new
           mock_it Fog::Parsers::Vcloud::GetVdc.new, 200,
             xml.Vdc(xmlns.merge(:href => vdc[:href], :name => vdc[:name])) {
               xml.Link(:rel => "up",
-                       :href => DATA[:organizations].detect { |org| org[:vdcs].detect { |_vdc| vdc[:href] == _vdc[:href] }[:href] == vdc[:href] }[:info][:href],
+                       :href => Fog::Vcloud::Mock.data[:organizations].detect { |org| org[:vdcs].detect { |_vdc| vdc[:href] == _vdc[:href] }[:href] == vdc[:href] }[:info][:href],
                        :type => "application/vnd.vmware.vcloud.org+xml")
               xml.Link(:rel => "add",
                        :href => vdc[:href] + "/action/uploadVAppTemplate",
@@ -48,7 +48,7 @@ module Fog
               xml.AllocationModel("AllocationPool")
               xml.Description(vdc[:name] + " VDC")
               xml.ResourceEntities {
-                DATA[:vdc_resources].each do |resource|
+                Fog::Vcloud::Mock.data[:vdc_resources].each do |resource|
                   xml.ResourceEntity(resource)
                 end
               }

data/lib/fog/vcloud/requests/get_versions.rb

@@ -28,7 +28,7 @@ module Fog
         mock_it Fog::Parsers::Vcloud::GetVersions.new, 200,
           xml.SupportedVersions( xmlns.merge("xmlns" => "http://www.vmware.com/vcloud/versions")) {
 
-            DATA[:versions].select {|version| version[:supported] }.each do |version|
+            Fog::Vcloud::Mock.data[:versions].select {|version| version[:supported] }.each do |version|
               xml.VersionInfo {
                 xml.Version(version[:version])
                 xml.LoginUrl(version[:login_url])

data/lib/fog/vcloud/requests/login.rb

@@ -31,7 +31,7 @@ module Fog
 
         mock_it Fog::Parsers::Vcloud::Login.new, 200,
           xml.OrgList(xmlns) {
-              DATA[:organizations].each do |org|
+              Fog::Vcloud::Mock.data[:organizations].each do |org|
                 xml.Org( org[:info].merge( "type" => "application/vnd.vmware.vcloud.org+xml" ) ) {}
               end
             },

data/lib/fog/vcloud/terremark/ecloud.rb

@@ -3,6 +3,24 @@ module Fog
     module Terremark
       module Ecloud
 
+        module Mock
+          def self.base_url
+            "https://fakey.com/api/v0.8a-ext2.0"
+          end
+
+          def self.data
+            @mock_data ||= Fog::Vcloud::Mock.data
+          end
+
+          def self.public_ip_href(ip)
+            "#{base_url}/extensions/publicIp/#{ip[:id]}"
+          end
+
+          def self.internet_service_href(internet_service)
+            "#{base_url}/extensions/internetService/#{internet_service[:id]}"
+          end
+        end
+
         module Versions
           SUPPORTED = ["v0.8", "v0.8a-ext2.0"]
         end
@@ -11,14 +29,30 @@ module Fog
           #Do anything we need to do here that's specific to ecloud
           unless @required
             require 'fog/vcloud/terremark/all'
+            require 'fog/vcloud/terremark/ecloud/models/internet_service'
+            require 'fog/vcloud/terremark/ecloud/models/internet_services'
+            require 'fog/vcloud/terremark/ecloud/models/public_ip'
+            require 'fog/vcloud/terremark/ecloud/models/public_ips'
             require 'fog/vcloud/terremark/ecloud/models/vdc'
             require 'fog/vcloud/terremark/ecloud/models/vdcs'
+            require 'fog/vcloud/terremark/ecloud/parsers/get_internet_services'
+            require 'fog/vcloud/terremark/ecloud/parsers/get_public_ip'
+            require 'fog/vcloud/terremark/ecloud/parsers/get_public_ips'
             require 'fog/vcloud/terremark/ecloud/parsers/get_vdc'
+            require 'fog/vcloud/terremark/ecloud/parsers/internet_service'
+            require 'fog/vcloud/terremark/ecloud/requests/add_internet_service'
+            require 'fog/vcloud/terremark/ecloud/requests/delete_internet_service'
+            require 'fog/vcloud/terremark/ecloud/requests/get_internet_services'
+            require 'fog/vcloud/terremark/ecloud/requests/get_public_ip'
+            require 'fog/vcloud/terremark/ecloud/requests/get_public_ips'
             require 'fog/vcloud/terremark/ecloud/requests/login'
             require 'fog/vcloud/terremark/ecloud/requests/get_vdc'
             Struct.new("TmrkEcloudVdc", :links, :resource_entities, :networks,
                        :cpu_capacity, :storage_capacity, :memory_capacity, :deployed_vm_quota, :instantiated_vm_quota,
                        :href, :type, :name, :xmlns, :description)
+            Struct.new("TmrkEcloudList", :links)
+            Struct.new("TmrkEcloudPublicIp", :type, :href, :name, :id)
+            Struct.new("TmrkEcloudInternetService", :type, :href, :id, :name, :public_ip, :port, :protocol, :enabled, :timeout, :description, :url_send_string, :http_header)
             @required = true
           end
           if Fog.mocking?

data/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb

@@ -0,0 +1,29 @@
+require 'fog/model'
+
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+        class InternetService < Fog::Vcloud::Model
+
+          identity :href
+
+          attribute :name
+          attribute :id
+          attribute :type
+          attribute :protocol
+          attribute :port
+          attribute :enabled
+          attribute :description
+          attribute :public_ip
+          attribute :timeout
+          attribute :url_send_string
+          attribute :http_header
+
+        end
+      end
+    end
+  end
+end
+
+

data/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Mock
+          def internet_services(options = {})
+            @internet_services ||= Fog::Vcloud::Terremark::Ecloud::InternetServices.new(options.merge(:connection => self))
+          end
+        end
+
+        module Real
+          def internet_services(options = {})
+            @internet_services ||= Fog::Vcloud::Terremark::Ecloud::InternetServices.new(options.merge(:connection => self))
+          end
+        end
+
+        class InternetServices < Fog::Vcloud::Collection
+
+          attr_accessor :href
+
+          model Fog::Vcloud::Terremark::Ecloud::InternetService
+
+          vcloud_type "application/vnd.tmrk.ecloud.internetService+xml"
+          all_request lambda { |internet_services| internet_services.raw_results }
+
+          def get(uri)
+            if internet_service = get_raw(uri)
+              item = new(:href => internet_service.href)
+              item.reload
+            end
+          end
+
+          def get_raw(uri)
+            raw_results.body.links.detect { |link| link.href == uri }
+          end
+
+          def raw_results
+            @raw_results ||= connection.get_internet_services(self.href)
+          end
+
+          #def reload
+          #  super
+          #  @raw_results = nil
+          #end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb

@@ -0,0 +1,26 @@
+require 'fog/model'
+
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+        class PublicIp < Fog::Vcloud::Model
+
+          identity :href
+
+          attribute :name
+          attribute :type
+          attribute :id
+
+          def internet_services
+            @internet_services ||= Fog::Vcloud::Terremark::Ecloud::InternetServices.
+              new( :connection => connection,
+                   :href => href.to_s + "/internetServices" )
+          end
+
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        module Mock
+          def public_ips(options = {})
+            @public_ips ||= Fog::Vcloud::Terremark::Ecloud::PublicIps.new(options.merge(:connection => self))
+          end
+        end
+
+        module Real
+          def public_ips(options = {})
+            @public_ips ||= Fog::Vcloud::Terremark::Ecloud::PublicIps.new(options.merge(:connection => self))
+          end
+        end
+
+        class PublicIps < Fog::Vcloud::Collection
+
+          attr_accessor :href
+
+          model Fog::Vcloud::Terremark::Ecloud::PublicIp
+
+          get_request :get_public_ip
+          vcloud_type "application/vnd.tmrk.ecloud.publicIp+xml"
+          all_request lambda { |public_ips| public_ips.connection.get_public_ips(public_ips.href) }
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/terremark/ecloud/models/vdc.rb

@@ -13,6 +13,17 @@ module Fog
           attribute :deployed_vm_quota
           attribute :instantiated_vm_quota
 
+          def public_ips
+            @public_ips ||= Fog::Vcloud::Terremark::Ecloud::PublicIps.new( :connection => connection,
+                                                                           :href => other_links.detect { |link| link.type == "application/vnd.tmrk.ecloud.publicIpsList+xml" }.href )
+          end
+
+          def internet_services
+            @internet_services ||= Fog::Vcloud::Terremark::Ecloud::InternetServices.
+              new( :connection => connection,
+                   :href => href.to_s.gsub('vdc','extensions/vdc') + "/internetServices" )
+          end
+
         end
       end
     end

data/lib/fog/vcloud/terremark/ecloud/parsers/get_internet_services.rb

@@ -0,0 +1,59 @@
+module Fog
+  module Parsers
+    module Vcloud
+      module Terremark
+        module Ecloud
+
+          class GetInternetServices < Fog::Parsers::Vcloud::Base
+
+            def reset
+              @response = Struct::TmrkEcloudList.new([])
+              @in = nil
+              @public_ip = nil
+            end
+
+            def start_element(name, attributes)
+              @value = nil
+              case name
+              when 'InternetService'
+                @in = :service
+                @service = Struct::TmrkEcloudInternetService.new("application/vnd.tmrk.ecloud.internetService+xml")
+              when 'PublicIpAddress'
+                @in = :public_ip
+                @public_ip = Struct::TmrkEcloudPublicIp.new("application/vnd.tmrk.ecloud.publicIp+xml")
+              end
+            end
+
+            def end_element(name)
+              target = case @in
+              when :service
+                @service
+              when :public_ip
+                @public_ip
+              end
+
+              case name
+              when 'Href'
+                target[name.downcase] = URI.parse(@value)
+              when 'Name', 'Protocol', 'Description', 'SendString', 'HttpHeader'
+                #The gsub takes the CamelCase names and turns them into camel_case
+                target[Fog::Parsers::Vcloud.de_camel(name)] = @value
+              when 'Id', 'Port', 'Timeout'
+                target[name.downcase] = @value.to_i
+              when 'Enabled'
+                @service[name.downcase] = ( @value == "true" ? true : false )
+              when 'InternetService'
+                @response.links << @service
+                @in = nil
+              when 'PublicIpAddress'
+                @service.public_ip = @public_ip
+                @in = :service
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/terremark/ecloud/parsers/get_public_ip.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module Vcloud
+      module Terremark
+        module Ecloud
+
+          class GetPublicIp < Fog::Parsers::Vcloud::Base
+
+            def reset
+              @response = Struct::TmrkEcloudPublicIp.new("application/vnd.tmrk.ecloud.publicIp+xml")
+            end
+
+            def end_element(name)
+              case name
+              when 'Href'
+                @response[name.downcase] = URI.parse(@value)
+              when 'Name'
+                @response[name.downcase] = @value
+              when 'Id'
+                @response['id'] = @value.to_i
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/vcloud/terremark/ecloud/parsers/get_public_ips.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module Vcloud
+      module Terremark
+        module Ecloud
+
+          class GetPublicIps < Fog::Parsers::Vcloud::Base
+
+            def reset
+              @response = Struct::TmrkEcloudList.new([])
+            end
+
+            def start_element(name, attributes)
+              @value = nil
+              case name
+              when 'PublicIPAddress'
+                @ip_address = Struct::TmrkEcloudPublicIp.new("application/vnd.tmrk.ecloud.publicIp+xml")
+              end
+            end
+
+            def end_element(name)
+              case name
+              when 'Href'
+                @ip_address[name.downcase] = URI.parse(@value)
+              when 'Name'
+                @ip_address[name.downcase] = @value
+              when 'Id'
+                @ip_address[name.downcase] = @value.to_i
+              when 'PublicIPAddress'
+                @response.links << @ip_address
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,58 @@
+module Fog
+  module Parsers
+    module Vcloud
+      module Terremark
+        module Ecloud
+
+          class InternetService < Fog::Parsers::Vcloud::Base
+
+            def reset
+              @response = Struct::TmrkEcloudInternetService.new("application/vnd.tmrk.ecloud.internetService+xml")
+              @in = nil
+              @public_ip = nil
+            end
+
+            def start_element(name, attributes)
+              @value = nil
+              case name
+              when 'InternetService'
+                @in = :service
+              when 'PublicIpAddress'
+                @in = :public_ip
+                @public_ip = Struct::TmrkEcloudPublicIp.new("application/vnd.tmrk.ecloud.publicIp+xml")
+              end
+            end
+
+            def end_element(name)
+              target = case @in
+              when :service
+                @response
+              when :public_ip
+                @public_ip
+              end
+
+              case name
+              when 'Href'
+                target[name.downcase] = URI.parse(@value)
+              when 'Name', 'Protocol', 'Description', 'SendString', 'HttpHeader'
+                #The gsub takes the CamelCase names and turns them into camel_case
+                target[Fog::Parsers::Vcloud.de_camel(name)] = @value
+              when 'Id', 'Port', 'Timeout'
+                target[name.downcase] = @value.to_i
+              when 'Enabled'
+                @response[name.downcase] = ( @value == "true" ? true : false )
+              when 'InternetService'
+                @in = nil
+              when 'PublicIpAddress'
+                @response.public_ip = @public_ip
+                @in = :service
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+