v2 modifications

Author: haniavis

addMethods.rb

@@ -1,4 +1,4 @@
-#
+
 # Copyright (c) 2012 NITLab, University of Thessaly, CERTH, Greece
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -83,7 +83,7 @@ def reserveNodes(nodesInfo)
 		end
 		start_time = time1.strftime("%Y-%m-%d %H:%M:%S")
 		finish_time = time2.strftime("%Y-%m-%d %H:%M:%S")
-		
+	
 		puts "Connecting to database..."
 		begin
 			# connect to the MySQL server
@@ -112,10 +112,28 @@ def reserveNodes(nodesInfo)
 				slice_name = name
 			end
 			puts slice_name
+
+			# Reservation while being in the active time slot
+			node_y = 0
+			now = Time.now
+			puts now
+			# execute enable_node for reservations in the active time slot
+			final_reserved.each do | id |
+				if (start_time < now) && (now < finish_time)
+					my_query = dbh.prepare("SELECT y FROM node_list WHERE id = '#{id}'")
+					result = my_query.execute()
+					my_query.fetch do | y |
+						node_y = y
+					end
+					puts node_y
+
+					cmd = `enable_node #{slice_name} #{node_y}`
+				end
+			end
+
 			# insert values into the database
 			i = 0
 			final_reserved.each do | id |
-	#dbh.do("INSERT INTO reservation (username, begin_time,#{nodesInfo.keys[2]},#{nodesInfo.keys[3]}) VALUES ('#{slice_name[0]}','#{nodesInfo.values[1]}','#{nodesInfo.values[2]}','#{id}')")i
 				puts id
 				id = id.to_i
 				puts id
@@ -216,7 +234,6 @@ def reserveChannels(channelInfo)
 			puts slice_name
 			i = 0
 			final_reserved.each do | id |
-	#dbh.do("INSERT INTO spec_reserve (#{channelInfo.keys[0]}, #{channelInfo.keys[1]},#{channelInfo.keys[2]},#{channelInfo.keys[3]}) VALUES ('#{channelInfo.values[0]}','#{channelInfo.values[1]}','#{channelInfo.values[2]}','#{id}')")
 				dbh.do("INSERT INTO spec_reserve (username,begin_time,end_time,spectrum_id) VALUES ('#{slice_name[0]}','#{start_time}','#{finish_time}','#{id}')")
 					final_reserved[i] = id
 					i += 1
@@ -427,7 +444,7 @@ def addSlice(sliceInfo)
 				new_id = n[0]
 			end
 			# create OMF pubsub node into the xmpp server
-			value = `create_slice_sfa #{slice_name} #{new_id}`
+			value = `create_slice #{slice_name} nitlab.inf.uth.gr`
 
 		rescue DBI::DatabaseError => e
 			puts "An error occurred"

api_conf

@@ -1,4 +1,4 @@
--database
--user
--password
--server_ip
+database
+user
+password
+server_ip

deleteMethods.rb

@@ -59,7 +59,7 @@ def deleteKey(keyInfo)
 
 			num = dbh.do("DELETE FROM rsa_keys WHERE rsa_keys.key = '#{key}'")
 			if (num == 1)	
-					return 0
+				return 0
 			end
 
 		rescue DBI::DatabaseError => e
@@ -185,7 +185,7 @@ def deleteUserFromSlice(userSliceInfo)
 
 			num = dbh.do("DELETE FROM users_slices WHERE user_id = '#{user_id}' AND slice_id = '#{slice_id}'")
 			if (num == 1)	
-					return 0
+				return 0
 			end
 
 		rescue DBI::DatabaseError => e
@@ -305,8 +305,23 @@ def releaseNodes(reservation)
 			# get server version string and display it
 			row = dbh.select_one("SELECT VERSION()")
 			puts "Server version: " + row[0]
-		
+
+			# Delete reservation while being in the active time slot
+			now = Time.now
 			ids.each do | id |
+				my_query = dbh.prepare("SELECT begin_time,end_time FROM reservation WHERE id = '#{id}'")
+				result = my_query.execute()
+				my_query.fetch do | y |
+					if (y["begin_time"] < now) && (now < y["end_time"])
+					puts "MPIKEE"
+						my_query = dbh.prepare("SELECT reservation.username, node_list.y FROM reservation JOIN node_list on reservation.node_id=node_list.id WHERE id = '#{id}'")
+						result = my_query.execute()
+						my_query.fetch do | h |
+							  cmd = `disable_node #{h["username"]} #{h["y"]} nitlab.inf.uth.gr`
+						end
+					end
+				end
+
 				num = dbh.do("DELETE FROM reservation WHERE id = '#{id}'")
 				if num == 1
 					deleted.push(id)

getMethods.rb

@@ -67,7 +67,7 @@ def getNodes(filter, retValue)
 			i=0
 			my_query.fetch do | n |
 # FILTERING because of non functional nodes ***
-				if n[0] != "node001" && n[0] != "node006" && n[0] != "node010" && n[0] != "node024" && n[0] != "node028" && n[0] != "node031"
+				if n[0] != "node031"
 					pos_result[i] = pos.new("#{n[6]}","#{n[7]}","#{n[8]}")
 					final_result[i] = final.new("#{n[0]}","#{n[1]}","#{n[2]}","#{n[3]}","#{n[4]}","#{n[5]}",pos_result[i])
 					puts final_result[i]
@@ -164,13 +164,13 @@ def getNodes(filter, retValue)
 			pos_result = Array.new
 			i=j=0
 			my_query[j].fetch do | n |
-				if n[0] != "node006" && n[0] != "node010" && n[0] != "node022" && n[0] != "node024" && n[0] != "node028" && n[0] != "node031"
+#	if n[0] != "node006" && n[0] != "node010" && n[0] != "node022" && n[0] != "node024" && n[0] != "node028" && n[0] != "node031"
 					pos_result[i] = pos.new("#{n[6]}","#{n[7]}","#{n[8]}")
 					final_result[i] = final.new("#{n[0]}","#{n[1]}","#{n[2]}","#{n[3]}","#{n[4]}","#{n[5]}",pos_result[i])
 					puts final_result[i]
 					i=i+1
 					j=j+1
-				end # end filtering
+#				end # end filtering
 		end
 		elsif !retValue.empty? && !filter.empty? 
 			query = "SELECT "
@@ -447,8 +447,8 @@ def getReservedNodes(filter, retValue)
 #			if retValue.empty? && filter.empty? 
 			final = Struct.new(:reservation_id,:slice_id,:start_time,:end_time,:node_id)
 			# select only the active reservations. Those that have not expired
-			my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), node_id FROM reservation WHERE end_time>'#{now}'")
-#my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), node_id FROM reservation WHERE begin_time>='20120801'")
+my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), node_id FROM reservation WHERE end_time>'#{now}'")
+#my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), node_id FROM reservation WHERE begin_time>='20130401'")
 			my_query.execute()				
 			i=0
 			my_query.fetch do | n |
@@ -498,8 +498,8 @@ def getReservedChannels()
 			now = time.strftime("%Y-%m-%d %H:%M:%S")
 			final = Struct.new(:reservation_id,:slice_id,:start_time,:end_time,:channel_id)
 			# select only the active reservations. Those that have not expired...
-			my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), spectrum_id FROM spec_reserve WHERE end_time>'#{now}'")
-#my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), node_id FROM reservation WHERE end_time>='#{now}'")
+my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), spectrum_id FROM spec_reserve WHERE end_time>'#{now}'")
+#my_query = dbh.prepare("SELECT id, username, unix_timestamp(begin_time), unix_timestamp(end_time), node_id FROM reservation WHERE end_time>='20130401'")
 			my_query.execute()
 			i=0
 			my_query.fetch do | n |
@@ -527,7 +527,7 @@ def getReservedChannels()
 	end
 
 ###################################################################
-# Returns the table users and the rsa_keys.
+# Returns the table jos_users and the rsa_keys.
 #
 # Returns a struct for each user and all the information we have about him.
 # [{user_id="",username="",email="",keys=[[""],[""]]},
@@ -582,9 +582,18 @@ def getUsers()
 ###################################################################
 	def getTestbedInfo()
 		final = Struct.new(:name,:grain,:OMF_version,:scheduler_version,:gw_address,:longitude,:latitude)
-		final_result = final.new("nitos","1800","5.3","1.0","nitlab.inf.uth.gr","39.360839","22.949989")			
+		final_result = final.new("nitos","1800","5.4","1.0","nitlab.inf.uth.gr","39.360839","22.949989")			
 		puts "result: #{final_result}"
 		final_result
 	end
-	
+
+###################################################################			
+# Returns time in the server
+###################################################################
+	def getServerTime()
+		# get the time now
+		time = Time.now.to_i
+		time
+	end
+
 end

nitosAPI.rb

@@ -36,7 +36,7 @@
 require_relative 'scheduler'
 
 counter = 1
-file = File.new("../api_conf","r")
+file = File.new("api_conf","r")
 while(line = file.gets)
 	if(counter == 1)
 		$db = line

updateMethods.rb

@@ -116,7 +116,7 @@ def updateChannel(channelInfo)
 	end
 
 ###################################################################
-# Updates a user from users table 
+# Updates a user from jos_users table 
 # Returns 0 for success or -1 for failure
 ###################################################################
 	def updateUser(userInfo)
@@ -130,11 +130,11 @@ def updateUser(userInfo)
 			row = dbh.select_one("SELECT VERSION()")
 			puts "Server version: " + row[0]
 
-			user_id = dbh.prepare("SELECT id FROM b9tj1_users WHERE id = '#{userInfo.values[0]}'")
+			user_id = dbh.prepare("SELECT id FROM jos_users WHERE id = '#{userInfo.values[0]}'")
 			user_id.execute()
 			user_id.fetch do | id |
 				userInfo.values[1].each do | key, value |
-					num.push(dbh.do("UPDATE b9tj1_users SET #{key} = '#{value}' WHERE id = '#{id[0]}'"))
+					num.push(dbh.do("UPDATE jos_users SET #{key} = '#{value}' WHERE id = '#{id[0]}'"))
 				end	
 			end
 			# if one field of the table was updated, its enough
@@ -233,6 +233,8 @@ def updateReservedNodes(reservationInfo)
 			row = dbh.select_one("SELECT VERSION()")
 			puts "Server version: " + row[0]
 
+			# ******ADD CODE FOR UPDATING AN ACTIVE RESERVATION******
+			# *******************************************************
 			reservationInfo.values[0].each do | id |
 				num = dbh.do("UPDATE reservation SET begin_time='#{start_time}', end_time ='#{finish_time}' WHERE id = '#{id}'")
 				if num == 1