fog-maestrodev 1.14.0.20130806165225 → 1.15.0.20130829165835

data/lib/fog/openstack/requests/image/update_image.rb

@@ -4,18 +4,17 @@ module Fog
       class Real
 
         def update_image(attributes)
-
-         data = {
-              "x-image-meta-name" => attributes[:name],
-              "x-image-meta-disk-format" => attributes[:disk_format],
-              "x-image-meta-container-format" => attributes[:container_format],
-              "x-image-meta-size" => attributes[:size],
-              "x-image-meta-is-public" => attributes[:is_public],
-              "x-image-meta-min-ram"  => attributes[:min_ram],
-              "x-image-meta-min-disk" => attributes[:min_disk],
-              "x-image-meta-checksum" => attributes[:checksum],
-              "x-image-meta-owner" => attributes[:owner]
-          }
+          data = {
+            'x-image-meta-name'             => attributes[:name],
+            'x-image-meta-disk-format'      => attributes[:disk_format],
+            'x-image-meta-container-format' => attributes[:container_format],
+            'x-image-meta-size'             => attributes[:size],
+            'x-image-meta-is-public'        => attributes[:is_public],
+            'x-image-meta-min-ram'          => attributes[:min_ram],
+            'x-image-meta-min-disk'         => attributes[:min_disk],
+            'x-image-meta-checksum'         => attributes[:checksum],
+            'x-image-meta-owner'            => attributes[:owner]
+          }.reject {|k,v| v.nil? }
 
           unless attributes[:properties].nil?
             attributes[:properties].each do |key,value|
@@ -40,28 +39,27 @@ module Fog
           response.status = 200
           image = self.images.last
           response.body = {
-                            'image'=> {
-                              'name'             => attributes[:name] || image.name,
-                              'size'             => image.size,
-                              'min_disk'         => (attributes[:min_disk] || image.min_disk).to_i,
-                              'disk_format'      => attributes[:disk_format] || image.disk_format,
-                              'created_at'       => image.created_at,
-                              'container_format' => attributes[:container_format] || image.container_format,
-                              'deleted_at'       => nil,
-                              'updated_at'       => Time.now.to_s,
-                              'checksum'         => image.checksum,
-                              'id'               => attributes[:id],
-                              'deleted'          => false,
-                              'protected'        => false,
-                              'is_public'        => attributes[:is_public] || image.is_public,
-                              'status'           => image.status,
-                              'min_ram'          => (attributes[:min_ram] || image.min_ram).to_i,
-                              'owner'            => attributes[:owner] || image.owner,
-                              'properties'       => attributes[:properties] || image.properties
-                            }
-                          }
+            'image'=> {
+              'name'             => attributes[:name] || image.name,
+              'size'             => image.size,
+              'min_disk'         => (attributes[:min_disk] || image.min_disk).to_i,
+              'disk_format'      => attributes[:disk_format] || image.disk_format,
+              'created_at'       => image.created_at,
+              'container_format' => attributes[:container_format] || image.container_format,
+              'deleted_at'       => nil,
+              'updated_at'       => Time.now.to_s,
+              'checksum'         => image.checksum,
+              'id'               => attributes[:id],
+              'deleted'          => false,
+              'protected'        => false,
+              'is_public'        => attributes[:is_public] || image.is_public,
+              'status'           => image.status,
+              'min_ram'          => (attributes[:min_ram] || image.min_ram).to_i,
+              'owner'            => attributes[:owner] || image.owner,
+              'properties'       => attributes[:properties] || image.properties
+            }
+          }
           response
-
         end
 
       end

data/lib/fog/openstack/requests/storage/get_object_https_url.rb

@@ -18,8 +18,8 @@ module Fog
         # ==== See Also
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
         def get_object_https_url(container, object, expires, options = {})
-          if @rackspace_temp_url_key.nil?
-            raise ArgumentError, "Storage must my instantiated with the :rackspace_temp_url_key option"
+          if @openstack_temp_url_key.nil?
+            raise ArgumentError, "Storage must my instantiated with the :openstack_temp_url_key option"
           end
 
           method         = 'GET'
@@ -28,7 +28,7 @@ module Fog
           object_path_unescaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{object}"
           string_to_sign = "#{method}\n#{expires}\n#{object_path_unescaped}"
 
-          hmac = Fog::HMAC.new('sha1', @rackspace_temp_url_key)
+          hmac = Fog::HMAC.new('sha1', @openstack_temp_url_key)
           sig  = sig_to_hex(hmac.sign(string_to_sign))
 
           "https://#{@host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"

data/lib/fog/openstack/requests/storage/post_set_meta_temp_url_key.rb

@@ -8,7 +8,7 @@ module Fog
         # used to generate signed expiring URLs.
         #
         # Once the key has been set with this request you should create new
-        # Storage objects with the :rackspace_temp_url_key option then use
+        # Storage objects with the :openstack_temp_url_key option then use
         # the get_object_https_url method to generate expiring URLs.
         #
         # *** CAUTION *** changing this secret key will invalidate any expiring

data/lib/fog/openstack/storage.rb

@@ -9,7 +9,7 @@ module Fog
                  :openstack_api_key
       recognizes :persistent, :openstack_service_name,
                  :openstack_service_type, :openstack_tenant,
-                 :openstack_region
+                 :openstack_region, :openstack_temp_url_key
 
       model_path 'fog/openstack/models/storage'
       model       :directory
@@ -45,7 +45,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'mime/types'
           @openstack_api_key = options[:openstack_api_key]
           @openstack_username = options[:openstack_username]
           @path = '/v1/AUTH_1234'
@@ -58,7 +57,7 @@ module Fog
         def reset_data
           self.class.data.delete(@openstack_username)
         end
-        
+
         def change_account(account)
           @original_path ||= @path
           version_string = @original_path.split('/')[1]
@@ -74,7 +73,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'mime/types'
           @openstack_api_key = options[:openstack_api_key]
           @openstack_username = options[:openstack_username]
           @openstack_auth_url = options[:openstack_auth_url]
@@ -86,6 +84,7 @@ module Fog
           @openstack_region       = options[:openstack_region]
           @openstack_tenant       = options[:openstack_tenant]
           @connection_options     = options[:connection_options] || {}
+          @openstack_temp_url_key = options[:openstack_temp_url_key]
           authenticate
           @persistent = options[:persistent] || false
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
@@ -105,7 +104,7 @@ module Fog
         #     # List current user account details
         #     service = Fog::Storage[:openstack]
         #     service.request :method => 'HEAD'
-        #     
+        #
         # Would return something like:
         #
         #     Account:                      AUTH_1234
@@ -118,9 +117,9 @@ module Fog
         #
         #     service.change_account('AUTH_3333')
         #     service.request :method => 'HEAD'
-        # 
+        #
         # Would return something like:
-        #     
+        #
         #     Account:                      AUTH_3333
         #     Date:                         Tue, 05 Mar 2013 16:51:53 GMT
         #     X-Account-Bytes-Used:         23423433
@@ -130,9 +129,9 @@ module Fog
         # If we wan't to go back to our original admin account:
         #
         #     service.reset_account_name
-        # 
+        #
         def change_account(account)
-          @original_path ||= @path 
+          @original_path ||= @path
           version_string = @path.split('/')[1]
           @path = "/#{version_string}/#{account}"
         end
@@ -174,7 +173,7 @@ module Fog
         end
 
         private
-        
+
         def authenticate
           if !@openstack_management_url || @openstack_must_reauthenticate
             options = {
@@ -188,7 +187,7 @@ module Fog
               :openstack_endpoint_type => 'publicURL'
             }
 
-            credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
+            credentials = Fog::OpenStack.authenticate(options, @connection_options)
 
             @current_user = credentials[:user]
             @current_tenant = credentials[:tenant]

data/lib/fog/openstack.rb

@@ -49,6 +49,15 @@ module Fog
     service(:volume,  'openstack/volume',  'Volume')
     service(:metering,  'openstack/metering',  'Metering')
 
+    def self.authenticate(options, connection_options = {})
+      case options[:openstack_auth_uri].path
+      when /v1(\.\d+)?/
+        authenticate_v1(options, connection_options)
+      else
+        authenticate_v2(options, connection_options)
+      end
+    end
+
     # legacy v1.0 style auth
     def self.authenticate_v1(options, connection_options = {})
       uri = options[:openstack_auth_uri]
@@ -69,7 +78,7 @@ module Fog
 
       return {
         :token => response.headers['X-Auth-Token'],
-        :server_management_url => response.headers['X-Server-Management-Url'],
+        :server_management_url => response.headers['X-Server-Management-Url'] || response.headers['X-Storage-Url'],
         :identity_public_endpoint => response.headers['X-Keystone']
       }
     end

data/lib/fog/rackspace/cdn.rb

@@ -119,6 +119,10 @@ module Fog
         include Base
 
         def initialize(options={})
+          # api_key and username missing from instance variable sets
+          @rackspace_api_key = options[:rackspace_api_key]
+          @rackspace_username = options[:rackspace_username]
+          
           @connection_options = options[:connection_options] || {}
           @rackspace_auth_url = options[:rackspace_auth_url]
           @rackspace_cdn_url = options[:rackspace_cdn_url]
@@ -176,6 +180,15 @@ module Fog
           @auth_token = credentials['X-Auth-Token']
         end
 
+        # Fix for invalid auth_token, likely after 24 hours.
+        def authenticate(options={})
+         super({
+           :rackspace_api_key  => @rackspace_api_key,
+           :rackspace_username => @rackspace_username,
+           :rackspace_auth_url => @rackspace_auth_url,
+           :connection_options => @connection_options
+         })
+        end
       end
     end
   end

data/lib/fog/rackspace/compute.rb

@@ -6,6 +6,10 @@ module Fog
     class Rackspace < Fog::Service
       include Fog::Rackspace::Errors
 
+      class ServiceError < Fog::Rackspace::Errors::ServiceError; end
+      class InternalServerError < Fog::Rackspace::Errors::InternalServerError; end
+      class BadRequest < Fog::Rackspace::Errors::BadRequest; end
+
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :rackspace_servicenet, :persistent
       recognizes :rackspace_auth_token, :rackspace_management_url, :rackspace_compute_v1_url, :rackspace_region
@@ -204,13 +208,13 @@ module Fog
         def request(params, parse_json = true, &block)
           super(params, parse_json, &block)
         rescue Excon::Errors::NotFound => error
-          raise NotFound.slurp(error, region)
+          raise NotFound.slurp(error, self)
         rescue Excon::Errors::BadRequest => error
-          raise BadRequest.slurp error
+          raise BadRequest.slurp(error, self)
         rescue Excon::Errors::InternalServerError => error
-          raise InternalServerError.slurp error
+          raise InternalServerError.slurp(error, self)
         rescue Excon::Errors::HTTPStatusError => error
-          raise ServiceError.slurp error
+          raise ServiceError.slurp(error, self)
         end
 
         def service_net?

data/lib/fog/rackspace/compute_v2.rb

@@ -76,10 +76,12 @@ module Fog
 
       request :create_image
       request :list_images
+      request :list_images_detail
       request :get_image
       request :delete_image
 
       request :list_flavors
+      request :list_flavors_detail
       request :get_flavor
 
       request :attach_volume

data/lib/fog/rackspace/databases.rb

@@ -88,13 +88,13 @@ module Fog
         def request(params, parse_json = true, &block)
           super(params, parse_json, &block)
         rescue Excon::Errors::NotFound => error
-          raise NotFound.slurp(error, region)
+          raise NotFound.slurp(error, self)
         rescue Excon::Errors::BadRequest => error
-          raise BadRequest.slurp error
+          raise BadRequest.slurp(error, self)
         rescue Excon::Errors::InternalServerError => error
-          raise InternalServerError.slurp error
+          raise InternalServerError.slurp(error, self)
         rescue Excon::Errors::HTTPStatusError => error
-          raise ServiceError.slurp error
+          raise ServiceError.slurp(error, self)
         end
 
         def endpoint_uri(service_endpoint_url=nil)

data/lib/fog/rackspace/dns.rb

@@ -115,17 +115,17 @@ module Fog
           begin
             super(params, parse_json, &block)
           rescue Excon::Errors::NotFound => error
-            raise NotFound.slurp(error, region)
+            raise NotFound.slurp(error, self)
           rescue Excon::Errors::BadRequest => error
-            raise BadRequest.slurp error
+            raise BadRequest.slurp(error, self)
           rescue Excon::Errors::InternalServerError => error
-            raise InternalServerError.slurp error
+            raise InternalServerError.slurp(error, self)
           rescue Excon::Errors::ServiceUnavailable => error
-            raise ServiceUnavailable.slurp error
+            raise ServiceUnavailable.slurp(error, self)
           rescue Excon::Errors::Conflict => error
-            raise Conflict.slurp error
+            raise Conflict.slurp(error, self)
           rescue Excon::Errors::HTTPStatusError => error
-            raise ServiceError.slurp error
+            raise ServiceError.slurp(error, self)
           end
         end
 

data/lib/fog/rackspace/examples/compute_v2/bootstrap_server.rb

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+
+# This example demonstrates creating a server with the Rackpace Open Cloud
+
+require 'rubygems' #required for Ruby 1.8.x
+require 'fog'
+require 'base64' #required to encode files for personality functionality
+require 'sshkey' #required to generate ssh keys. 'gem install sshkey'
+
+def get_user_input(prompt)
+  print "#{prompt}: "
+  gets.chomp
+end
+
+# Use username defined in ~/.fog file, if absent prompt for username. 
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_username
+  Fog.credentials[:rackspace_username] || get_user_input("Enter Rackspace Username")
+end
+
+# Use api key defined in ~/.fog file, if absent prompt for api key
+# For more details on ~/.fog refer to http://fog.io/about/getting_started.html
+def rackspace_api_key
+  Fog.credentials[:rackspace_api_key] || get_user_input("Enter Rackspace API key")
+end
+
+# Generates a ssh key using the SSHKey library. The private key is avaialble via
+# the '.private_key' and the public key is avaialble via '.ssh_public_key'
+def generate_ssh_key
+  SSHKey.generate
+end
+
+# create Next Generation Cloud Server service
+service = Fog::Compute.new({
+  :provider             => 'rackspace',
+  :rackspace_username   => rackspace_username,
+  :rackspace_api_key    => rackspace_api_key,
+  :version => :v2,  # Use Next Gen Cloud Servers
+  :rackspace_region => :ord #Use Chicago Region
+})
+
+# pick the first flavor
+flavor = service.flavors.first
+
+# pick the first Ubuntu image we can find
+image = service.images.find {|image| image.name =~ /Ubuntu/}
+
+# prompt for server name
+server_name = get_user_input "\nEnter Server Name"
+
+# generate the ssh key
+ssh_key = generate_ssh_key
+
+# reload flavor in order to retrieve all of its attributes
+flavor.reload
+
+puts "\nNow creating server '#{server_name}' the following with specifications:\n" 
+puts "\t* #{flavor.ram} MB RAM"
+puts "\t* #{flavor.disk} GB"
+puts "\t* #{flavor.vcpus} CPU(s)"
+puts "\t* #{image.name}"
+puts "\n"
+
+begin
+  # bootstrap server
+  server = service.servers.bootstrap :name => server_name, 
+                                     :flavor_id => flavor.id, 
+                                     :image_id => image.id,
+                                     :private_key => ssh_key.private_key,
+                                     :public_key => ssh_key.ssh_public_key
+
+  if server.ready?
+    puts "[DONE]\n\n"
+
+    puts "The server has been successfully created.\n"
+    puts "Write the following ssh keys to you ~/.ssh directory in order to log in\n\n"
+    puts "+++++++++++PRIVATE_KEY (~/.ssh/fog_key)++++++++++++"
+    puts ssh_key.private_key
+    puts "++++++++++PUBLIC_KEY (~/.ssh/fog_key.pub)++++++++++"
+    puts ssh_key.ssh_public_key
+    puts "+++++++++++++++++++++++++++++++++++++++++++++++++++i\n\n"
+
+    puts "You can then log into the server using the following command\n"
+    puts "ssh #{server.username}@#{server.public_ip_address}\n\n"
+  else
+    puts "An error occured, please try again"
+  end
+  
+rescue Fog::Errors::TimeoutError
+  puts "[TIMEOUT]\n\n"
+  
+  puts "This server is currently #{server.progress}% into the build process and is taking longer to complete than expected."
+  puts "You can continute to monitor the build process through the web console at https://mycloud.rackspace.com/\n\n" 
+end
+
+puts "To delete the server please execute the delete_server.rb script\n\n"
+
+

data/lib/fog/rackspace/load_balancers.rb

@@ -73,6 +73,7 @@ module Fog
       request :get_error_page
       request :set_error_page
       request :remove_error_page
+      request :get_stats
 
       module Shared
 
@@ -122,13 +123,13 @@ module Fog
         def request(params, parse_json = true, &block)
           super(params, parse_json, &block)
         rescue Excon::Errors::NotFound => error
-          raise NotFound.slurp(error, region)
+          raise NotFound.slurp(error, self)
         rescue Excon::Errors::BadRequest => error
-          raise BadRequest.slurp error
+          raise BadRequest.slurp(error, self)
         rescue Excon::Errors::InternalServerError => error
-          raise InternalServerError.slurp error
+          raise InternalServerError.slurp(error, self)
         rescue Excon::Errors::HTTPStatusError => error
-          raise ServiceError.slurp error
+          raise ServiceError.slurp(error, self)
         end
 
         def authenticate(options={})

data/lib/fog/rackspace/models/compute_v2/flavors.rb

@@ -15,9 +15,8 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
         # @note Fog's currentl implementation only returns 1000 flavors.
-        # @note Fog does not retrieve all flavor details. Please use #get to retrieve all details for a specific flavor.
         def all
-          data = service.list_flavors.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 

data/lib/fog/rackspace/models/compute_v2/images.rb

@@ -5,6 +5,30 @@ module Fog
   module Compute
     class RackspaceV2
       class Images < Fog::Collection
+        
+        # @!attribute [rw] name
+        # @return [String] Given a string value x, filters the list of images by image name.
+        attribute :name
+        
+        # @!attribute [rw] status
+        # @return [String] Given a string value x, filters the list of images by status.
+        # @note Possible values are ACTIVE, DELETED, ERROR, SAVING, and UNKNOWN.
+        attribute :status
+        
+        # @!attribute [rw] marker
+        # @return [String] Given a string value x, return object names greater in value than the specified marker.
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/List_Large_Number_of_Objects-d1e1521.html
+        attribute :marker
+        
+        # @!attribute [rw] limit
+        # @return [Integer] For an integer value n, limits the number of results to at most n values.
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/List_Large_Number_of_Objects-d1e1521.html
+        attribute :limit
+        
+        # @!attribute [rw] type
+        # @return [String] Given a string value x, filters the list of images by type. 
+        # @note Valid values are BASE and SNAPSHOT
+        attribute :type
 
         model Fog::Compute::RackspaceV2::Image
 
@@ -15,10 +39,18 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
         # @note Fog's current implementation only returns 1000 images.
-        # @note Fog does not retrieve all image details. Please use get to retrieve all details for a specific image.
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/List_Images-d1e4435.html
-        def all
-          data = service.list_images.body['images']
+        def all(options = {})
+          options = {
+            'name'          => name,
+            'status'        => status,
+            'marker'        => marker,
+            'limit'         => limit,
+            'type'          => type
+          }.merge!(options)
+          merge_attributes(options)
+
+          data = service.list_images_detail(options).body['images']
           load(data)
         end
 

data/lib/fog/rackspace/models/compute_v2/metadatum.rb

@@ -19,7 +19,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
         def destroy
           requires :identity
-          connection.delete_metadata_item(collection_name, parent.id, key)
+          service.delete_metadata_item(collection_name, parent.id, key)
           true
         end
 
@@ -31,7 +31,7 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
         def save
           requires :identity, :value
-          connection.set_metadata_item(collection_name, parent.id, key, value)
+          service.set_metadata_item(collection_name, parent.id, key, value)
           true
         end
 

data/lib/fog/rackspace/models/identity/service_catalog.rb

@@ -22,7 +22,7 @@ module Fog
         
         def display_service_regions(service_type)
           endpoints = get_endpoints(service_type)
-          endpoints.collect { |k,v| ":#{k}" }.join(", ")          
+          endpoints.collect { |k,v| ":#{k}" }.join(", ")
         end
         
         def get_endpoint(service_type, region=nil)
@@ -32,7 +32,7 @@ module Fog
           return endpoint if endpoint.is_a?(String) #There is only one endpoint for service
 
           unless region
-            raise "There are multiple endpoints avaliable for #{service_type}. Please specify one of the following regions: #{display_service_regions(service_type)}."
+            raise "There are multiple endpoints available for #{service_type}. Please specify one of the following regions: #{display_service_regions(service_type)}."
           end
           region = region.is_a?(String) ? region.to_sym : region
           endpoint = get_endpoints(service_type)[region]
@@ -48,10 +48,16 @@ module Fog
                 
         def self.from_response(service, hash)
           service_catalog = ServiceCatalog.new :service => service
-          services = hash["access"]["serviceCatalog"]
-          services.each do |serv|
-            name = serv["name"].to_sym
-            service_catalog.send(:add_endpoints, name, serv)
+          begin
+            services = hash["access"]["serviceCatalog"]
+            services.each do |serv|
+              name = serv["name"] ? serv["name"].to_sym : nil
+              next unless name
+              service_catalog.send(:add_endpoints, name, serv)
+            end
+          rescue => e
+            Logger.warning "Exception occurred while loading service catalog - #{e.inspect}"
+            Logger.warning "Unable to load service catalog. Please specify endpoints manually"
           end
           service_catalog
         end
@@ -59,20 +65,32 @@ module Fog
         private
         
         def add_endpoints(service_name, hash)
-          endpoints = hash["endpoints"]
-          if endpoints.size == 1
-            catalog[service_name] = endpoints[0]["publicURL"].freeze
-          else
-            catalog[service_name] = endpoints_from_array(endpoints)
+          begin
+            endpoints = hash["endpoints"]
+            if endpoints.size == 1
+              catalog[service_name] = endpoints[0]["publicURL"].freeze
+            else
+              catalog[service_name] = endpoints_from_array(service_name, endpoints)
+            end
+          rescue => e
+            Logger.warning "Exception occurred while loading #{service_name} service endpoints - #{e.inspect}"
+            Logger.warning "Unable to load service endpoints for #{service_name}. Please specify #{service_name} endpoints manually."
           end
         end
         
-        def endpoints_from_array(endpoints)
+        def endpoints_from_array(service_name, endpoints)
           hash = {}
           endpoints.each do |endpoint|
-            region = endpoint["region"].downcase.to_sym
-            url = endpoint["publicURL"].freeze
-            hash[region] = url
+            begin
+              region_name = endpoint["region"]
+              region = region_name ? region_name.downcase.to_sym : :global
+              url = endpoint["publicURL"].freeze
+              hash[region] = url
+            rescue => e
+              Logger.warning "Exception occurred while loading #{service_name} service endpoints - #{e.inspect}"
+              Logger.warning "Unable to parse #{service_name} endpoint - #{endpoint}"
+              Logger.warning "You may need to specify #{service_name} endpoints manually."
+            end
           end
           hash
         end
@@ -80,4 +98,4 @@ module Fog
       end
     end
   end
-end
+end