1.1 --- a/OpenSecurity/bin/opensecurity_client_restful_server.py	Thu Jun 05 14:56:17 2014 +0200
     1.2 +++ b/OpenSecurity/bin/opensecurity_client_restful_server.py	Thu Jun 05 15:04:13 2014 +0100
     1.3 @@ -423,7 +423,7 @@
     1.4          
     1.5          # we _need_ a net_resource
     1.6          if not "hostonly_ip" in args:
     1.7 -            raise web.badrequest('no net_resource given')
     1.8 +            raise web.badrequest('no hostonly_ip given')
     1.9          
    1.10          ip = args['hostonly_ip']
    1.11          ip = ip[:ip.rindex('.')]

     2.1 --- a/OpenSecurity/bin/vmmanager.pyw	Thu Jun 05 14:56:17 2014 +0200
     2.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Thu Jun 05 15:04:13 2014 +0100
     2.3 @@ -372,7 +372,7 @@
     2.4          self.startVM(self.vmRootName)
     2.5          self.waitStartup(self.vmRootName)
     2.6          
     2.7 -        tmp_ip = VMManager.getHostOnlyIP(self.vmRootName)
     2.8 +        tmp_ip = self.getHostOnlyIP(self.vmRootName)
     2.9          tmp_machine_folder = Cygwin.cygPath(self.machineFolder)
    2.10          Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y update"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key'))
    2.11          Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y upgrade"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key'))
    2.12 @@ -465,12 +465,12 @@
    2.13      # stop VM
    2.14      def stopVM(self, vm_name):
    2.15          logger.info('Sending shutdown signal to ' + vm_name)
    2.16 -        Cygwin.checkResult(Cygwin.sshExecute( '"sudo shutdown -h now"', VMManager.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key' ))
    2.17 +        Cygwin.checkResult(Cygwin.sshExecute( '"sudo shutdown -h now"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key' ))
    2.18      
    2.19      # stop VM
    2.20      def hibernateVM(self, vm_name):
    2.21          logger.info('Sending hibernate-disk signal to ' + vm_name)
    2.22 -        Cygwin.checkResult(Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', VMManager.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False))
    2.23 +        Cygwin.checkResult(Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False))
    2.24              
    2.25      # poweroff VM
    2.26      def poweroffVM(self, vm_name):