|
 |
3340af |
commit 004ce512d61867bcc981ae49c5fbf5ffb30172fa
|
|
|
3340af |
Author: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
3340af |
Date: Mon Sep 15 15:05:25 2014 +0200
|
|
|
3340af |
|
|
|
3340af |
fence_zvm: Add support for 'on', improve documentation
|
|
|
3340af |
|
|
|
3340af |
Author: Neale Ferguson
|
|
|
3340af |
|
|
|
3340af |
diff --git a/fence/agents/zvm/fence_zvm.8 b/fence/agents/zvm/fence_zvm.8
|
|
|
3340af |
index 359436e..8c0d35a 100644
|
|
|
3340af |
--- a/fence/agents/zvm/fence_zvm.8
|
|
|
3340af |
+++ b/fence/agents/zvm/fence_zvm.8
|
|
|
3340af |
@@ -52,7 +52,7 @@ forcibly terminated. Currently, this option is ignored.
|
|
|
3340af |
This option is used by fence_node(8) and is ignored by fence_zvm.
|
|
|
3340af |
.TP
|
|
|
3340af |
\fIaction = < action >\fP
|
|
|
3340af |
-Fencing action: "off" - fence off device; "metadata" - display device metadata; "status" - state of device
|
|
|
3340af |
+Fencing action: "off" - deactivate virtual machine; "on" - activate virtual machine; "metadata" - display device metadata" - describe fence agent parameters; "status" - state of virtual machine
|
|
|
3340af |
.TP
|
|
|
3340af |
\fIport = < target >\fP
|
|
|
3340af |
Name of virtual machine to recycle.
|
|
|
3340af |
diff --git a/fence/agents/zvm/fence_zvm.c b/fence/agents/zvm/fence_zvm.c
|
|
|
3340af |
index e5a7c2b..524e21e 100644
|
|
|
3340af |
--- a/fence/agents/zvm/fence_zvm.c
|
|
|
3340af |
+++ b/fence/agents/zvm/fence_zvm.c
|
|
|
3340af |
@@ -699,15 +699,15 @@ get_options_stdin (zvm_driver_t *zvm)
|
|
|
3340af |
|
|
|
3340af |
if (!strcasecmp (opt, "action")) {
|
|
|
3340af |
if (strcasecmp(arg, "off") == 0) {
|
|
|
3340af |
- fence = 0;
|
|
|
3340af |
- } else if (strcasecmp(arg, "on") == 0) {
|
|
|
3340af |
fence = 1;
|
|
|
3340af |
- } else if (strcasecmp(arg, "metadata") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(arg, "on") == 0) {
|
|
|
3340af |
fence = 2;
|
|
|
3340af |
- } else if (strcasecmp(arg, "status") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(arg, "metadata") == 0) {
|
|
|
3340af |
fence = 3;
|
|
|
3340af |
- } else {
|
|
|
3340af |
+ } else if (strcasecmp(arg, "status") == 0) {
|
|
|
3340af |
fence = 4;
|
|
|
3340af |
+ } else {
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
} else if (!strcasecmp (opt, "ipaddr")) {
|
|
|
3340af |
lSrvName = MIN(strlen(arg), sizeof(zvm->smapiSrv));
|
|
|
3340af |
@@ -738,7 +738,7 @@ get_options_stdin (zvm_driver_t *zvm)
|
|
|
3340af |
zvm->delay = DEFAULT_DELAY;
|
|
|
3340af |
}
|
|
|
3340af |
} else if (!strcasecmp (opt, "help")) {
|
|
|
3340af |
- fence = 4;
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
}
|
|
|
3340af |
return(fence);
|
|
|
3340af |
@@ -769,15 +769,15 @@ get_options(int argc, char **argv, zvm_driver_t *zvm)
|
|
|
3340af |
break;
|
|
|
3340af |
case 'o' :
|
|
|
3340af |
if (strcasecmp(optarg, "off") == 0) {
|
|
|
3340af |
- fence = 0;
|
|
|
3340af |
- } else if (strcasecmp(optarg, "on") == 0) {
|
|
|
3340af |
fence = 1;
|
|
|
3340af |
- } else if (strcasecmp(optarg, "metadata") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(optarg, "on") == 0) {
|
|
|
3340af |
fence = 2;
|
|
|
3340af |
- } else if (strcasecmp(optarg, "status") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(optarg, "metadata") == 0) {
|
|
|
3340af |
fence = 3;
|
|
|
3340af |
- } else {
|
|
|
3340af |
+ } else if (strcasecmp(optarg, "status") == 0) {
|
|
|
3340af |
fence = 4;
|
|
|
3340af |
+ } else {
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
break;
|
|
|
3340af |
case 'a' :
|
|
|
3340af |
@@ -807,7 +807,7 @@ get_options(int argc, char **argv, zvm_driver_t *zvm)
|
|
|
3340af |
memcpy(zvm->node, optarg, lSrvNode);
|
|
|
3340af |
break;
|
|
|
3340af |
default :
|
|
|
3340af |
- fence = 4;
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
}
|
|
|
3340af |
return(fence);
|
|
|
3340af |
@@ -874,22 +874,26 @@ main(int argc, char **argv)
|
|
|
3340af |
fence = get_options_stdin(&zvm);
|
|
|
3340af |
|
|
|
3340af |
switch(fence) {
|
|
|
3340af |
- case 0 : // OFF
|
|
|
3340af |
+ case 0 : // OFFON
|
|
|
3340af |
+ if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
+ rc = zvm_smapi_imageRecycle(&zvm);
|
|
|
3340af |
+ break;
|
|
|
3340af |
+ case 1 : // OFF
|
|
|
3340af |
if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
rc = zvm_smapi_imageDeactivate(&zvm);
|
|
|
3340af |
break;
|
|
|
3340af |
- case 1 : // ON
|
|
|
3340af |
+ case 2 : // ON
|
|
|
3340af |
if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
rc = zvm_smapi_imageActivate(&zvm);
|
|
|
3340af |
break;
|
|
|
3340af |
- case 2 : // METADATA
|
|
|
3340af |
+ case 3 : // METADATA
|
|
|
3340af |
rc = zvm_metadata();
|
|
|
3340af |
break;
|
|
|
3340af |
- case 3 : // STATUS
|
|
|
3340af |
+ case 4 : // STATUS
|
|
|
3340af |
if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
rc = zvm_smapi_imageQuery(&zvm);
|
|
|
3340af |
break;
|
|
|
3340af |
- case 4 :
|
|
|
3340af |
+ case 5 :
|
|
|
3340af |
rc = usage();
|
|
|
3340af |
}
|
|
|
3340af |
closelog();
|
|
|
3340af |
diff --git a/fence/agents/zvm/fence_zvmip.8 b/fence/agents/zvm/fence_zvmip.8
|
|
|
3340af |
index 8217d61..6b01425 100644
|
|
|
3340af |
--- a/fence/agents/zvm/fence_zvmip.8
|
|
|
3340af |
+++ b/fence/agents/zvm/fence_zvmip.8
|
|
|
3340af |
@@ -55,7 +55,7 @@ Display usage information
|
|
|
3340af |
This option is used by fence_node(8) and is ignored by fence_zvmip.
|
|
|
3340af |
.TP
|
|
|
3340af |
\fIaction = < action >\fP
|
|
|
3340af |
-Fencing action: "off" - fence off device; "metadata" - display device metadata; "status" - state of device
|
|
|
3340af |
+Fencing action: "off" - deactivate virtual machine; "on" - activate virtual machine; "metadata" - display device metadata" - describe fence agent parameters; "status" - state of virtual machine
|
|
|
3340af |
.TP
|
|
|
3340af |
\fIplug = < plug >\fP
|
|
|
3340af |
Name of virtual machine to recycle.
|
|
|
3340af |
diff --git a/fence/agents/zvm/fence_zvmip.c b/fence/agents/zvm/fence_zvmip.c
|
|
|
3340af |
index 3342bc6..bd7c536 100644
|
|
|
3340af |
--- a/fence/agents/zvm/fence_zvmip.c
|
|
|
3340af |
+++ b/fence/agents/zvm/fence_zvmip.c
|
|
|
3340af |
@@ -677,15 +677,15 @@ get_options_stdin (zvm_driver_t *zvm)
|
|
|
3340af |
|
|
|
3340af |
if (!strcasecmp (opt, "action")) {
|
|
|
3340af |
if (strcasecmp(arg, "off") == 0) {
|
|
|
3340af |
- fence = 0;
|
|
|
3340af |
- } else if (strcasecmp(arg, "on") == 0) {
|
|
|
3340af |
fence = 1;
|
|
|
3340af |
- } else if (strcasecmp(arg, "metadata") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(arg, "on") == 0) {
|
|
|
3340af |
fence = 2;
|
|
|
3340af |
- } else if (strcasecmp(arg, "status") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(arg, "metadata") == 0) {
|
|
|
3340af |
fence = 3;
|
|
|
3340af |
- } else {
|
|
|
3340af |
+ } else if (strcasecmp(arg, "status") == 0) {
|
|
|
3340af |
fence = 4;
|
|
|
3340af |
+ } else {
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
} else if (!strcasecmp (opt, "ipaddr")) {
|
|
|
3340af |
lSrvName = MIN(strlen(arg), sizeof(zvm->smapiSrv)-1);
|
|
|
3340af |
@@ -712,7 +712,7 @@ get_options_stdin (zvm_driver_t *zvm)
|
|
|
3340af |
zvm->timeOut = DEFAULT_TIMEOUT;
|
|
|
3340af |
}
|
|
|
3340af |
} else if (!strcasecmp (opt, "help")) {
|
|
|
3340af |
- fence = 2;
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
}
|
|
|
3340af |
return(fence);
|
|
|
3340af |
@@ -746,15 +746,15 @@ get_options(int argc, char **argv, zvm_driver_t *zvm)
|
|
|
3340af |
break;
|
|
|
3340af |
case 'o' :
|
|
|
3340af |
if (strcasecmp(optarg, "off") == 0) {
|
|
|
3340af |
- fence = 0;
|
|
|
3340af |
- } else if (strcasecmp(optarg, "on") == 0) {
|
|
|
3340af |
fence = 1;
|
|
|
3340af |
- } else if (strcasecmp(optarg, "metadata") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(optarg, "on") == 0) {
|
|
|
3340af |
fence = 2;
|
|
|
3340af |
- } else if (strcasecmp(optarg, "status") == 0) {
|
|
|
3340af |
+ } else if (strcasecmp(optarg, "metadata") == 0) {
|
|
|
3340af |
fence = 3;
|
|
|
3340af |
- } else {
|
|
|
3340af |
+ } else if (strcasecmp(optarg, "status") == 0) {
|
|
|
3340af |
fence = 4;
|
|
|
3340af |
+ } else {
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
break;
|
|
|
3340af |
case 'p' :
|
|
|
3340af |
@@ -784,7 +784,7 @@ get_options(int argc, char **argv, zvm_driver_t *zvm)
|
|
|
3340af |
}
|
|
|
3340af |
break;
|
|
|
3340af |
default :
|
|
|
3340af |
- fence = 4;
|
|
|
3340af |
+ fence = 5;
|
|
|
3340af |
}
|
|
|
3340af |
}
|
|
|
3340af |
return(fence);
|
|
|
3340af |
@@ -944,22 +944,26 @@ main(int argc, char **argv)
|
|
|
3340af |
fence = get_options_stdin(&zvm);
|
|
|
3340af |
|
|
|
3340af |
switch(fence) {
|
|
|
3340af |
- case 0 : // OFF
|
|
|
3340af |
+ case 0 : // OFFON
|
|
|
3340af |
+ if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
+ rc = zvm_smapi_imageRecycle(&zvm);
|
|
|
3340af |
+ break;
|
|
|
3340af |
+ case 1 : // OFF
|
|
|
3340af |
if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
rc = zvm_smapi_imageDeactivate(&zvm);
|
|
|
3340af |
break;
|
|
|
3340af |
- case 1 : // ON
|
|
|
3340af |
+ case 2 : // ON
|
|
|
3340af |
if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
rc = zvm_smapi_imageActivate(&zvm);
|
|
|
3340af |
break;
|
|
|
3340af |
- case 2 : // METADATA
|
|
|
3340af |
+ case 3 : // METADATA
|
|
|
3340af |
rc = zvm_metadata();
|
|
|
3340af |
break;
|
|
|
3340af |
- case 3 : // STATUS
|
|
|
3340af |
+ case 4 : // STATUS
|
|
|
3340af |
if ((rc = check_parm(&zvm)) == 0)
|
|
|
3340af |
rc = zvm_smapi_imageQuery(&zvm);
|
|
|
3340af |
break;
|
|
|
3340af |
- case 4 :
|
|
|
3340af |
+ case 5 :
|
|
|
3340af |
rc = usage();
|
|
|
3340af |
}
|
|
|
3340af |
closelog();
|