From cb2140ac82c8d8d890226b4ac5c409994f24d830 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 15 Jun 2011 19:21:47 +0200 Subject: [PATCH] feature #595: removed im_sh driver --- src/im_mad/im_sh/one_im_sh | 44 ---------------- src/im_mad/im_sh/one_im_sh.rb | 96 ----------------------------------- 2 files changed, 140 deletions(-) delete mode 100755 src/im_mad/im_sh/one_im_sh delete mode 100755 src/im_mad/im_sh/one_im_sh.rb diff --git a/src/im_mad/im_sh/one_im_sh b/src/im_mad/im_sh/one_im_sh deleted file mode 100755 index 5a62cb6720..0000000000 --- a/src/im_mad/im_sh/one_im_sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# -------------------------------------------------------------------------- # -# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); you may # -# not use this file except in compliance with the License. You may obtain # -# a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -#--------------------------------------------------------------------------- # - -#Setup driver variables -DRIVER_NAME=`basename $0 | cut -d. -f1` - -if [ -z "${ONE_LOCATION}" ]; then - DRIVERRC=/etc/one/${DRIVER_NAME}/${DRIVER_NAME}rc - MADCOMMON=/usr/lib/one/mads/madcommon.sh - VAR_LOCATION=/var/lib/one -else - DRIVERRC=$ONE_LOCATION/etc/${DRIVER_NAME}/${DRIVER_NAME}rc - MADCOMMON=$ONE_LOCATION/lib/mads/madcommon.sh - VAR_LOCATION=$ONE_LOCATION/var -fi - -. $MADCOMMON - -# Export the im_mad specific rc - -export_rc_vars $DRIVERRC - -# Go to var directory ONE_LOCATION/var or /var/lib/one -cd $VAR_LOCATION - -LOG_FILE=$DRIVER_NAME - -# Execute the actual MAD -execute_mad $* diff --git a/src/im_mad/im_sh/one_im_sh.rb b/src/im_mad/im_sh/one_im_sh.rb deleted file mode 100755 index 6188643260..0000000000 --- a/src/im_mad/im_sh/one_im_sh.rb +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env ruby - -# -------------------------------------------------------------------------- # -# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); you may # -# not use this file except in compliance with the License. You may obtain # -# a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -#--------------------------------------------------------------------------- # - -ONE_LOCATION=ENV["ONE_LOCATION"] - -if !ONE_LOCATION - RUBY_LIB_LOCATION="/usr/lib/one/ruby" - ETC_LOCATION="/etc/one/" - REMOTES_LOCATION="/var/lib/one/remotes" -else - RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby" - ETC_LOCATION=ONE_LOCATION+"/etc/" - REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/" -end - -$: << RUBY_LIB_LOCATION - -require 'OpenNebulaDriver' -require 'getoptlong' - -#------------------------------------------------------------------------------- -# The Local Information Manager Driver -#------------------------------------------------------------------------------- -class InformationManagerDriverSH < OpenNebulaDriver - - #--------------------------------------------------------------------------- - # Init the driver - #--------------------------------------------------------------------------- - def initialize(hypervisor, num) - super(num, true, 0) - - @config = read_configuration - @hypervisor = hypervisor - - @cmd_path = "#{REMOTES_LOCATION}/im" - - # register actions - register_action(:MONITOR, method("action_monitor")) - end - - #--------------------------------------------------------------------------- - # Execute the run_probes in the remote host - #--------------------------------------------------------------------------- - def action_monitor(number, host, unused) - cmd_string = "#{@cmd_path}/run_probes #{@hypervisor} #{host}" - - local_action(cmd_string, number, "MONITOR") - end - -end - -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -# IM Driver main program -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- - -opts = GetoptLong.new( - [ '--threads', '-t', GetoptLong::OPTIONAL_ARGUMENT ] -) - -hypervisor = '' -threads = 15 - -begin - opts.each do |opt, arg| - case opt - when '--threads' - threads = arg.to_i - end - end -rescue Exception => e - exit(-1) -end - -if ARGV.length >= 1 - hypervisor = ARGV.shift -end - -im = InformationManagerDriverSH.new(hypervisor,threads) -im.start_driver