Mercurialopensecurity / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | raw
| help
OpenSecurity/bin/vmmanager.pyw
changeset 181 3875d43bacd2
parent 180 444525c7f32c
child 182 6e9b8f105de1 
     1.1 --- a/OpenSecurity/bin/vmmanager.pyw	Thu Jun 05 14:56:17 2014 +0200
     1.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Thu Jun 05 15:04:13 2014 +0100
     1.3 @@ -372,7 +372,7 @@
     1.4          self.startVM(self.vmRootName)
     1.5          self.waitStartup(self.vmRootName)
     1.6          
     1.7 -        tmp_ip = VMManager.getHostOnlyIP(self.vmRootName)
     1.8 +        tmp_ip = self.getHostOnlyIP(self.vmRootName)
     1.9          tmp_machine_folder = Cygwin.cygPath(self.machineFolder)
    1.10          Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y update"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key'))
    1.11          Cygwin.checkResult(Cygwin.sshExecute('"sudo apt-get -y upgrade"', tmp_ip, 'osecuser', tmp_machine_folder + '/' + self.vmRootName + '/dvm_key'))
    1.12 @@ -465,12 +465,12 @@
    1.13      # stop VM
    1.14      def stopVM(self, vm_name):
    1.15          logger.info('Sending shutdown signal to ' + vm_name)
    1.16 -        Cygwin.checkResult(Cygwin.sshExecute( '"sudo shutdown -h now"', VMManager.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key' ))
    1.17 +        Cygwin.checkResult(Cygwin.sshExecute( '"sudo shutdown -h now"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key' ))
    1.18      
    1.19      # stop VM
    1.20      def hibernateVM(self, vm_name):
    1.21          logger.info('Sending hibernate-disk signal to ' + vm_name)
    1.22 -        Cygwin.checkResult(Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', VMManager.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False))
    1.23 +        Cygwin.checkResult(Cygwin.sshBackgroundExecute( '"sudo hibernate-disk"', self.getHostOnlyIP(vm_name), 'osecuser', Cygwin.cygPath(self.machineFolder) + '/' + vm_name + '/dvm_key', wait_return=False))
    1.24              
    1.25      # poweroff VM
    1.26      def poweroffVM(self, vm_name):
opensecurity