diff --git a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/cancel-restore.expect b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/cancel-restore.expect new file mode 100644 index 0000000..afaf443 --- /dev/null +++ b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/cancel-restore.expect @@ -0,0 +1,9 @@ +#!/usr/bin/expect +set nodename [lindex $argv 0] + +spawn dsmc cancel restore -asnodename=$nodename + +expect -exact "Which session to Cancel ? (1 - 1 or Quit): " { + send -- "1\r" + expect eof +} diff --git a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp index 26e6b99..ebdb225 100644 --- a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp +++ b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp @@ -21,11 +21,25 @@ class net::baas2_restoretest( group => 'root', } - file { '/opt/baas2/run-restore.expect': + file { '/opt/baas2/run-successful-restore.expect': ensure => 'file', mode => '0755', owner => 'root', - content => file('net/baas2_restoretest/run-restore.expect') + content => file('net/baas2_restoretest/run-successful-restore.expect') + } + + file { '/opt/baas2/cancel-restore.expect': + ensure => 'file', + mode => '0755', + owner => 'root', + content => file('net/baas2_restoretest/cancel-restore.expect') + } + + file { '/opt/baas2/run-failed-restore.expect': + ensure => 'file', + mode => '0755', + owner => 'root', + content => file('net/baas2_restoretest/run-failed-restore.expect') } file { '/opt/baas2/validate-backup-files':