Refactor some logger messages

Author: jbatalle

.travis.yml

@@ -52,8 +52,7 @@ script:
   - rspec
   - rake start &
   - cd $TRAVIS_BUILD_DIR
-  - sleep 10
-  - sleep 20
+  - sleep 30
   - curl localhost:4000/
   - curl localhost:4000/network-services
   - curl localhost:4569/vnfs

ns-catalogue/routes/ns.rb

@@ -109,7 +109,7 @@ class Catalogue < NsCatalogue
     # @overload put '/network-services/:id'
     # Update a NS
     # @param [JSON] NS in JSON format
-    put '/:external_ns_id' do
+    put '/:external_ns_id' do |external_ns_id|
         # Return if content-type is invalid
         return 415 unless request.content_type == 'application/json'
 
@@ -118,7 +118,7 @@ class Catalogue < NsCatalogue
         return 400, errors.to_json if errors
 
         begin
-            ns = Ns.find_by('nsd.id' => params[:external_ns_id])
+            ns = Ns.find_by('nsd.id' => external_ns_id)
         rescue Mongoid::Errors::DocumentNotFound => e
             return 400, 'This NSD no exists'
         end
@@ -149,22 +149,21 @@ class Catalogue < NsCatalogue
     # @overload delete '/network-services/:external_vnf_id'
     #	Delete a NS by its ID
     #	@param [Integer] external_ns_id NS external ID
-    delete '/:external_ns_id' do
+    delete '/:external_ns_id' do |external_ns_id|
         begin
-            # ns = Ns.find( params[:external_ns_id] )
-            ns = Ns.find_by('nsd.id' => params[:external_ns_id])
+            ns = Ns.find_by('nsd.id' => external_ns_id)
         rescue Mongoid::Errors::DocumentNotFound => e
             halt 404
         end
         ns.destroy
         return 200
     end
 
-    get '/vnf/:vnf_id' do
+    get '/vnf/:vnf_id' do |vnf_id|
         begin
-            nss = Ns.find_by('nsd.vnfds' => params[:vnf_id])
+            nss = Ns.find_by('nsd.vnfds' => vnf_id)
         rescue Mongoid::Errors::DocumentNotFound => e
-            halt 404, 'No services using this VNFD'
+            halt 404, 'No services using the VNFD ' + vnf_id
         end
         return 200, nss.to_json
     end

ns-manager/helpers/authentication.rb

@@ -22,7 +22,7 @@ def self.check_token(token)
 		begin
             token = UserToken.find_by(token: token)
         rescue Mongoid::Errors::DocumentNotFound => e
-            puts 'User not found.'
+            logger.error 'User not found.'
             return false
         end
         return true

ns-manager/helpers/dc.rb

@@ -63,7 +63,7 @@ def getPoPExtraInfo(extraInfo)
         end
         pop_extra_info
     end
-    
+
     # Return the status of a PoP
     def popStatus(pop_info)
         keystone_url = getPoPExtraInfo(pop_info[:extra_info])['keystone']
@@ -97,7 +97,7 @@ def popStatus(pop_info)
         begin
             api_version = JSON.parse RestClient.get keystone_url, :content_type => :json, :'X-Auth-Token' => token
         rescue => e
-            puts e
+            logger.error e
         end
 
         return 200, JSON.pretty_generate(api_version)

ns-manager/helpers/mapping.rb

@@ -55,11 +55,11 @@ def saveMapping(mapping)
             begin
                 mapping = Mapping.create!(mapping)
             rescue => e
-                puts 'ERROR.................'
-                puts e
+                logger.error 'ERROR.................'
+                logger.error e
             end
         rescue => e
-            puts e
+            logger.error e
             logger.error 'Error saving mapping.'
             halt 400
         end

ns-manager/routes/accounting.rb

@@ -32,7 +32,7 @@ class AccountingController < TnovaManager
     rescue Errno::ECONNREFUSED
       halt 500, 'NS Provisioning unreachable'
     rescue => e
-      puts e.response
+      logger.error e.response
       #logger.error e.response
       halt e.response.code, e.response.body
     end

ns-manager/routes/authentication.rb

@@ -17,6 +17,10 @@
 #
 # @see Authentication
 class TeNORAuthentication < TnovaManager
+
+    # @method post_validation
+    # @overload post '/validation'
+    #  Validate a token
     post '/validation' do
         return 415 unless request.content_type == 'application/json'
         token, errors = parse_json(request.body.read)
@@ -33,6 +37,9 @@ class TeNORAuthentication < TnovaManager
         halt 200
     end
 
+    # @method post_login
+    # @overload post '/login'
+    # Login method returns a token
     post '/login' do
         return 415 unless request.content_type == 'application/json'
         credentials, errors = parse_json(request.body.read)
@@ -69,6 +76,9 @@ class TeNORAuthentication < TnovaManager
         halt 400
     end
 
+    # @method post_logout
+    # @overload post '/logout'
+    #  Logout method
     post '/logout' do
         return 415 if request.env['HTTP_X_AUTH_TOKEN'].nil?
         begin
@@ -80,6 +90,9 @@ class TeNORAuthentication < TnovaManager
         halt 200
     end
 
+    # @method post_register
+    # @overload post '/register'
+    # Register a new user
     post '/register' do
         user = User.new
         # user.name = params[:user][:name]
@@ -95,14 +108,14 @@ class TeNORAuthentication < TnovaManager
             user.save!
             status 201
         rescue => ex
-            puts "Error #{$ERROR_INFO}"
+            logger.error "Error #{$ERROR_INFO}"
             halt 422, { 'Content-Type' => 'text/plain' }, ex.message
         end
     end
 
     delete '/:uid' do
-        puts 'Delete user'
-        puts 'Admin user cannot be deleted.'
+        logger.error 'Delete user'
+        logger.error 'Admin user cannot be deleted.'
     end
 
     post '/:uid/reset_password' do

ns-manager/routes/dc.rb

@@ -90,11 +90,11 @@ class DcController < TnovaManager
             begin
                 dc = Dc.create!(serv)
             rescue => e
-                puts 'ERROR.................'
-                puts e
+                logger.error 'ERROR.................'
+                logger.error e
             end
         rescue => e
-            puts e
+            logger.error e
             logger.error 'Error saving dc.'
             halt 400
         end

ns-manager/routes/vnfs.rb

@@ -124,7 +124,7 @@ class VNFCatalogue < TnovaManager
         rescue => e
             logger.error e.response
             # halt e.response.code, e.response.body
-            logger.error 'No network services using this VNF.'
+            logger.error 'No services using the VNFD ' + vnf_id
         end
 
         begin

ns-monitoring/helpers/monitoring.rb

@@ -61,7 +61,7 @@ def self.subcriptionThread(monitoring)
                         @queue = VnfQueue.find_or_create_by(nsi_id: nsi_id, vnfi_id: vnf_instance['vnfr_id'], parameter_id: measurements['type'])
                         @queue.update_attributes(value: measurements['value'], timestamp: measurements['timestamp'], unit: measurements['unit'])
                     rescue => e
-                        puts e
+                        logger.error e
                     end
                     begin
                         @list_vnfs_parameters = VnfQueue.where(nsi_id: nsi_id, parameter_id: measurements['type'])
@@ -77,13 +77,13 @@ def self.subcriptionThread(monitoring)
                             logger.error 'NO equal. Wait next value'
                         end
                     rescue => e
-                        puts e
+                        logger.error e
                     end
                 end
                 logger.debug 'Adding to queue'
                 @@testThreads << { vnfi_id: vnf_instance['vnfr_id'], queue: t }
             rescue => e
-                puts e
+                logger.error e
             rescue Interrupt => _
                 logger.error 'THREAD INTERRUPTION ...'
                 conn.close
@@ -150,8 +150,8 @@ def self.startSubcription
                 end
             end
         rescue => e
-            puts 'Error!'
-            puts e
+            logger.error 'Error!'
+            logger.error e
         end
     end