diff --git a/install.sh b/install.sh
index 0990de9f96..7da1b48534 100755
--- a/install.sh
+++ b/install.sh
@@ -151,7 +151,7 @@ ETC_DIRS="$ETC_LOCATION/im_kvm \
$ETC_LOCATION/im_xen \
$ETC_LOCATION/im_ec2 \
$ETC_LOCATION/vmm_ec2 \
- $ETC_LOCATION/vmm_ssh \
+ $ETC_LOCATION/vmm_sh \
$ETC_LOCATION/tm_nfs \
$ETC_LOCATION/tm_ssh \
$ETC_LOCATION/tm_dummy \
@@ -240,7 +240,7 @@ INSTALL_OCCI_CLIENT_FILES[2]="OCCI_BIN_CLIENT_FILES:$BIN_LOCATION"
INSTALL_ETC_FILES[0]="ETC_FILES:$ETC_LOCATION"
INSTALL_ETC_FILES[1]="VMM_EC2_ETC_FILES:$ETC_LOCATION/vmm_ec2"
-INSTALL_ETC_FILES[2]="VMM_SH_ETC_FILES:$ETC_LOCATION/vmm_ssh"
+INSTALL_ETC_FILES[2]="VMM_SH_ETC_FILES:$ETC_LOCATION/vmm_sh"
INSTALL_ETC_FILES[3]="IM_EC2_ETC_FILES:$ETC_LOCATION/im_ec2"
INSTALL_ETC_FILES[4]="TM_NFS_ETC_FILES:$ETC_LOCATION/tm_nfs"
INSTALL_ETC_FILES[5]="TM_SSH_ETC_FILES:$ETC_LOCATION/tm_ssh"
@@ -317,8 +317,8 @@ RUBY_OPENNEBULA_LIB_FILES="src/oca/ruby/OpenNebula/Host.rb \
MADS_LIB_FILES="src/mad/sh/madcommon.sh \
src/tm_mad/tm_common.sh \
- src/vmm_mad/ssh/one_vmm_ssh.rb \
- src/vmm_mad/ssh/one_vmm_ssh \
+ src/vmm_mad/sh/one_vmm_sh.rb \
+ src/vmm_mad/sh/one_vmm_sh \
src/vmm_mad/ec2/one_vmm_ec2.rb \
src/vmm_mad/ec2/one_vmm_ec2 \
src/vmm_mad/dummy/one_vmm_dummy.rb \
@@ -421,15 +421,15 @@ ETC_FILES="share/etc/oned.conf \
#-------------------------------------------------------------------------------
# Virtualization drivers config. files, to be installed under $ETC_LOCATION
# - ec2, $ETC_LOCATION/vmm_ec2
-# - ssh, $ETC_LOCATION/vmm_ssh
+# - sh, $ETC_LOCATION/vmm_sh
#-------------------------------------------------------------------------------
VMM_EC2_ETC_FILES="src/vmm_mad/ec2/vmm_ec2rc \
src/vmm_mad/ec2/vmm_ec2.conf"
-VMM_SH_ETC_FILES="src/vmm_mad/ssh/vmm_sshrc \
- src/vmm_mad/ssh/vmm_ssh_kvm.conf \
- src/vmm_mad/ssh/vmm_ssh_xen.conf"
+VMM_SH_ETC_FILES="src/vmm_mad/sh/vmm_shrc \
+ src/vmm_mad/sh/vmm_sh_kvm.conf \
+ src/vmm_mad/sh/vmm_sh_xen.conf"
#-------------------------------------------------------------------------------
# Information drivers config. files, to be installed under $ETC_LOCATION
diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index 81ab5670cf..b304e57189 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -164,9 +164,9 @@ IM_MAD = [
#-------------------------------------------------------------------------------
VM_MAD = [
name = "vmm_kvm",
- executable = "one_vmm_ssh",
+ executable = "one_vmm_sh",
arguments = "kvm",
- default = "vmm_ssh/vmm_ssh_kvm.conf",
+ default = "vmm_sh/vmm_sh_kvm.conf",
type = "kvm" ]
#-------------------------------------------------------------------------------
@@ -175,9 +175,9 @@ VM_MAD = [
#-------------------------------------------------------------------------------
#VM_MAD = [
# name = "vmm_xen",
-# executable = "one_vmm_ssh",
+# executable = "one_vmm_sh",
# arguments = "xen",
-# default = "vmm_ssh/vmm_ssh_xen.conf",
+# default = "vmm_sh/vmm_sh_xen.conf",
# type = "xen" ]
#-------------------------------------------------------------------------------
diff --git a/src/vmm_mad/ssh/one_vmm_ssh b/src/vmm_mad/sh/one_vmm_sh
similarity index 94%
rename from src/vmm_mad/ssh/one_vmm_ssh
rename to src/vmm_mad/sh/one_vmm_sh
index 35a503ae63..1d278edc84 100755
--- a/src/vmm_mad/ssh/one_vmm_ssh
+++ b/src/vmm_mad/sh/one_vmm_sh
@@ -17,11 +17,11 @@
#--------------------------------------------------------------------------- #
if [ -z "${ONE_LOCATION}" ]; then
- DRIVERRC=/etc/one/vmm_ssh/vmm_sshrc
+ DRIVERRC=/etc/one/vmm_sh/vmm_shrc
MADCOMMON=/usr/lib/one/mads/madcommon.sh
VAR_LOCATION=/var/lib/one
else
- DRIVERRC=$ONE_LOCATION/etc/vmm_ssh/vmm_sshrc
+ DRIVERRC=$ONE_LOCATION/etc/vmm_sh/vmm_shrc
MADCOMMON=$ONE_LOCATION/lib/mads/madcommon.sh
VAR_LOCATION=$ONE_LOCATION/var
fi
diff --git a/src/vmm_mad/ssh/one_vmm_ssh.rb b/src/vmm_mad/sh/one_vmm_sh.rb
similarity index 96%
rename from src/vmm_mad/ssh/one_vmm_ssh.rb
rename to src/vmm_mad/sh/one_vmm_sh.rb
index ed37db0fee..60d39800e9 100755
--- a/src/vmm_mad/ssh/one_vmm_ssh.rb
+++ b/src/vmm_mad/sh/one_vmm_sh.rb
@@ -37,9 +37,9 @@ require "VirtualMachineDriver"
# ---------------------------------------------------------------------------- #
# The main class for the Sh driver #
# ---------------------------------------------------------------------------- #
-class SshDriver < VirtualMachineDriver
+class ShDriver < VirtualMachineDriver
# ------------------------------------------------------------------------ #
- # SshDriver constructor #
+ # ShDriver constructor #
# ------------------------------------------------------------------------ #
def initialize(hypervisor)
super(15,true)
@@ -120,9 +120,9 @@ class SshDriver < VirtualMachineDriver
end
# ---------------------------------------------------------------------------- #
-# SshDriver Main program
+# ShDriver Main program
# ---------------------------------------------------------------------------- #
hypervisor = ARGV[0]
-ssh_driver = SshDriver.new(hypervisor)
-ssh_driver.start_driver
+sh_driver = ShDriver.new(hypervisor)
+sh_driver.start_driver
diff --git a/src/vmm_mad/ssh/vmm_ssh_kvm.conf b/src/vmm_mad/sh/vmm_sh_kvm.conf
similarity index 100%
rename from src/vmm_mad/ssh/vmm_ssh_kvm.conf
rename to src/vmm_mad/sh/vmm_sh_kvm.conf
diff --git a/src/vmm_mad/ssh/vmm_ssh_xen.conf b/src/vmm_mad/sh/vmm_sh_xen.conf
similarity index 100%
rename from src/vmm_mad/ssh/vmm_ssh_xen.conf
rename to src/vmm_mad/sh/vmm_sh_xen.conf
diff --git a/src/vmm_mad/ssh/vmm_sshrc b/src/vmm_mad/sh/vmm_shrc
similarity index 100%
rename from src/vmm_mad/ssh/vmm_sshrc
rename to src/vmm_mad/sh/vmm_shrc