fog 0.1.8 → 0.1.9

data/lib/fog/vcloud.rb

@@ -178,14 +178,22 @@ module Fog
                       :subnet => "1.2.3.0/24",
                       :gateway => "1.2.3.1",
                       :netmask => "255.255.255.0",
-                      :fencemode => "isolated"
+                      :dns => "8.8.8.8",
+                      :features => [
+                        { :type => :fencemode, :value => "isolated" }
+                      ],
+                      :ips => { "1.2.3.3" => "Broom 1", "1.2.3.4" => "Broom 2", "1.2.3.10" => "Email" }
                     },
                     { :href => "#{base_url}/network/32",
                       :name => "4.5.6.0/24",
                       :subnet => "4.5.6.0/24",
                       :gateway => "4.5.6.1",
                       :netmask => "255.255.255.0",
-                      :fencemode => "isolated"
+                      :dns => "8.8.8.8",
+                      :features => [
+                        { :type => :fencemode, :value => "isolated" }
+                      ],
+                      :ips => { }
                     },
                   ],
                   :vms => [
@@ -231,8 +239,12 @@ module Fog
                       :name => "7.8.9.0/24",
                       :subnet => "7.8.9.0/24",
                       :gateway => "7.8.9.1",
+                      :dns => "8.8.8.8",
                       :netmask => "255.255.255.0",
-                      :fencemode => "isolated"
+                      :features => [
+                        { :type => :fencemode, :value => "isolated" }
+                      ],
+                      :ips => { "7.8.9.10" => "Master Blaster" }
                     }
                   ],
                   :vms => [
@@ -313,6 +325,7 @@ module Fog
           require 'fog/vcloud/models/vdcs'
           require 'fog/vcloud/terremark/vcloud'
           require 'fog/vcloud/terremark/ecloud'
+          require 'fog/vcloud/requests/get_network'
           require 'fog/vcloud/requests/get_organization'
           require 'fog/vcloud/requests/get_vdc'
           require 'fog/vcloud/requests/get_versions'
@@ -321,6 +334,7 @@ module Fog
           require 'fog/vcloud/parsers/get_vdc'
           require 'fog/vcloud/parsers/get_versions'
           require 'fog/vcloud/parsers/login'
+          require 'fog/vcloud/parsers/network'
 
           require 'builder'
 
@@ -331,6 +345,9 @@ module Fog
           Struct.new("VcloudVersion", :version, :login_url, :supported)
           Struct.new("VcloudOrgList", :organizations, :xmlns)
           Struct.new("VcloudXCapacity", :units, :allocated, :used, :limit)
+          Struct.new("VcloudNetwork", :features, :configuration, :href, :type, :name, :xmlns, :description)
+          Struct.new("VcloudNetworkConfiguration", :gateway, :netmask, :dns)
+          Struct.new("VcloudNetworkFenceMode", :mode)
           @required = true
         end
 

data/lib/fog/vcloud/collection.rb

@@ -18,7 +18,8 @@ module Fog
             @all_request = all_request
             class_eval <<-EOS, __FILE__, __LINE__
               def all
-                data = self.class.all_request.call(self).body.links.select do |link|
+                raw_all = self.class.all_request.call(self)
+                data = (raw_all.is_a?(Array) ? raw_all : raw_all.body.links).select do |link|
                   link.type == self.class.vcloud_type
                 end.map { |link| {:href => link.href, :name => link.name } }
                 load(data)
@@ -53,14 +54,33 @@ module Fog
         end
       end
 
-      def [](index)
-        self.slice(index).reload
+      attr_accessor :href
+
+      def create(attributes = {})
+        attributes.merge!(:new => true)
+        obj = super(attributes)
+        self << obj
+        obj
+      end
+
+      def each
+        super do |item|
+          item.reload
+          yield(item)
+        end
       end
 
-      def reload
-        self.all
+      def [](index)
+        if obj = super
+          obj.reload unless obj.loaded?
+        end
+        obj
       end
 
+      #def reload
+      #  self.all
+      #end
+
     end
   end
 end

data/lib/fog/vcloud/model.rb

@@ -27,9 +27,13 @@ module Fog
         end
       end
 
+      attr_accessor :loaded
+      alias_method :loaded?, :loaded
+
       def reload
         if data = collection.get_raw(identity)
           merge_get_raw_result(data)
+          @loaded = true
           self
         end
       end

data/lib/fog/vcloud/parsers/get_organization.rb

@@ -14,8 +14,8 @@ module Fog
           @response = Struct::VcloudOrganization.new([])
         end
 
-        def start_element(name, attributes)
-          @value = ''
+        def start_element(name, attributes=[])
+          super
           case name
           when 'Link'
             @response.links << generate_link(attributes)

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

@@ -12,8 +12,8 @@ module Fog
           @response = Struct::VcloudVdc.new([],[],[],Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new)
         end
 
-        def start_element(name, attributes)
-          @value = ''
+        def start_element(name, attributes=[])
+          super
           case name
           when 'Cpu'
             @target = :cpu_capacity

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

@@ -16,7 +16,7 @@ module Fog
         end
 
         def start_element(name, attributes = {})
-          @value = ''
+          super
           case name
           when "Version"
             @version = Struct::VcloudVersion.new

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

@@ -14,8 +14,8 @@ module Fog
           @response = Struct::VcloudOrgList.new([])
         end
 
-        def start_element(name, attributes)
-          @value = ''
+        def start_element(name, attributes=[])
+          super
           case name
           when 'OrgList'
             until attributes.empty?

data/lib/fog/vcloud/parsers/network.rb

@@ -0,0 +1,53 @@
+module Fog
+  module Parsers
+    module Vcloud
+
+      class Network < Fog::Parsers::Vcloud::Base
+
+        def reset
+          @response = Struct::VcloudNetwork.new([])
+        end
+
+        def start_element(name,attributes=[])
+          super
+          case name
+          when "Network"
+            handle_root(attributes)
+          when "Features"
+            @in = :features
+          when "Configuration"
+            @in = :configuration
+            @response.configuration = Struct::VcloudNetworkConfiguration.new
+          end
+        end
+
+        def end_element(name)
+          case @in
+          when :features
+            case name
+            when "FenceMode"
+              @response.features << Struct::VcloudNetworkFenceMode.new(@value)
+            when "Features"
+              @in = nil
+            end
+          when :configuration
+            case name
+            when "Gateway","Netmask","Dns"
+              @response.configuration[name.downcase] = @value
+            when "Configuration"
+              @in = nil
+            end
+          else
+            case name
+            when "Description"
+              @response.description = @value
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,54 @@
+module Fog
+  module Vcloud
+    class Real
+
+      def get_network(network_uri)
+       request(
+          :expects  => 200,
+          :method   => 'GET',
+          :parser   => Fog::Parsers::Vcloud::Network.new,
+          :uri      => uri
+        )
+      end
+
+    end
+
+    class Mock
+
+      def get_network(network_uri)
+        #
+        # Based off of:
+        # vCloud API Guide v0.8 - Page 50
+        #
+        # Did not implement AssociatedNetwork, seems redundant, haven't seen it in use yet
+        # Did not implement the following features: Dhcp, Nat & Firewall
+        #
+        type = "application/vnd.vmware.vcloud.network+xml"
+        response = Excon::Response.new
+        if network = mock_data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:href] == network_uri.to_s }
+          xml = Builder::XmlMarkup.new
+          mock_it Fog::Parsers::Vcloud::Network.new, 200,
+            xml.Network(xmlns.merge(:href => network[:href], :name => network[:name], :type => type)) {
+              xml.Description(network[:name])
+              xml.Configuration {
+                xml.Gateway(network[:gateway])
+                xml.Netmask(network[:netmask])
+                xml.Dns(network[:dns])
+              }
+              if network[:features]
+                xml.Features {
+                  if feature = network[:features].detect { |feature| feature[:type] == :fencemode }
+                    xml.FenceMode(feature[:value])
+                  end
+                }
+              end
+            },
+            { 'Content-Type' => type }
+        else
+          mock_error 200, "401 Unauthorized"
+        end
+      end
+
+    end
+  end
+end

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

@@ -3,13 +3,12 @@ module Fog
 
     class Real
       def get_organization(organization_uri)
-        response = request(
+        request(
           :expects  => 200,
           :method   => 'GET',
           :parser   => Fog::Parsers::Vcloud::GetOrganization.new,
           :uri      => organization_uri
         )
-        response
       end
 
     end

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

@@ -31,6 +31,10 @@ module Fog
             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/ip'
+            require 'fog/vcloud/terremark/ecloud/models/ips'
+            require 'fog/vcloud/terremark/ecloud/models/network'
+            require 'fog/vcloud/terremark/ecloud/models/networks'
             require 'fog/vcloud/terremark/ecloud/models/public_ip'
             require 'fog/vcloud/terremark/ecloud/models/public_ips'
             require 'fog/vcloud/terremark/ecloud/models/vdc'
@@ -40,19 +44,28 @@ module Fog
             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/parsers/network'
+            require 'fog/vcloud/terremark/ecloud/parsers/network_ips'
             require 'fog/vcloud/terremark/ecloud/requests/add_internet_service'
+            require 'fog/vcloud/terremark/ecloud/requests/configure_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_network'
+            require 'fog/vcloud/terremark/ecloud/requests/get_network_ips'
             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("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)
+            Struct.new("TmrkEcloudInternetService", :type, :href, :id, :name, :public_ip, :port, :protocol, 
+                                                    :enabled, :timeout, :description, :url_send_string, :http_header)
+            Struct.new("TmrkEcloudNetwork", :features, :configuration, :ips_link, :name, :type, :href, :xmlns)
+            Struct.new("TmrkEcloudNetworkIps", :addresses)
+            Struct.new("TmrkEcloudNetworkIp", :name, :status, :server)
             @required = true
           end
           if Fog.mocking?

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

@@ -20,6 +20,41 @@ module Fog
           attribute :url_send_string
           attribute :http_header
 
+          attr_accessor :new
+
+          def delete
+            requires :href
+
+            connection.delete_internet_service( self.href )
+            collection.reload
+          end
+
+          def save
+            if new_record?
+              result = connection.add_internet_service( collection.href, _compose_service_data )
+              self.href = result.body.href
+              self.reload
+            else
+              connection.configure_internet_service( self.href, _compose_service_data, _compose_ip_data )
+            end
+          end
+
+          private
+
+          def _compose_service_data
+            service_data = {}
+            self.class.attributes.select{ |attribute| !attribute.nil? }.each { |attribute| service_data[attribute] = send(attribute).to_s }
+            service_data
+          end
+
+          def _compose_ip_data
+            if public_ip.nil?
+              {}
+            else
+              { :id => self.public_ip.id, :href => self.public_ip.href.to_s, :name => self.public_ip.name }
+            end
+          end
+
         end
       end
     end

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

@@ -17,12 +17,10 @@ module Fog
 
         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 }
+          all_request lambda { |internet_services| internet_services.send(:raw_results) }
 
           def get(uri)
             if internet_service = get_raw(uri)
@@ -32,18 +30,20 @@ module Fog
           end
 
           def get_raw(uri)
-            raw_results.body.links.detect { |link| link.href == uri }
+            raw_results.body.links.detect { |link| link.href.to_s == uri.to_s }
+          end
+
+          def reload
+            super
+            @raw_results = nil
           end
 
+          private
+
           def raw_results
             @raw_results ||= connection.get_internet_services(self.href)
           end
 
-          #def reload
-          #  super
-          #  @raw_results = nil
-          #end
-
         end
       end
     end

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

@@ -0,0 +1,18 @@
+require 'fog/model'
+
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+        class Ip < Fog::Vcloud::Model
+
+          identity :name
+
+          attribute :status
+          attribute :server
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Fog
+  module Vcloud
+    module Terremark
+      module Ecloud
+
+        class Ips < Fog::Vcloud::Collection
+
+          model Fog::Vcloud::Terremark::Ecloud::Ip
+
+          undef_method :create
+
+          def all
+            load(connection.get_network_ips(href).body.addresses.
+                 map { |address| { :name => address.name, :status => address.status, :server => address.server } })
+          end
+
+          def get_raw(name)
+            raw_results.detect { |address| address.name == name }
+          end
+
+          def reload
+            super
+            @raw_results = nil
+          end
+
+          private
+
+          def raw_results
+            @raw_results ||= connection.get_network_ips(href).body.addresses
+          end
+
+        end
+      end
+    end
+  end
+end