xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-11-04 05:12:30 +00:00
Code Issues Releases Wiki Activity

add usage for rhevm commands

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13617 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2012-08-27 13:58:14 +00:00
parent 7f0c5a915f
commit ce0980f030
2 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
perl-xCAT/xCAT/Usage.pm
View File

@@ -384,6 +384,23 @@ Options:
"Usage:
rmflexnode [-h|--help|-v|--version]
rmflexnode <noderange>",
"lsve" =>
"Usage:
lsve [-t type] [-m manager] [-o object]
-t: dc - 'Data Center', cl - 'Cluster', sd - 'Storage Domain', nw - 'Network', tpm -'Template'
-m: FQDN (Fully Qualified Domain Name) of the rhev manager
-o: Target object to display",
"cfgve" =>
"Usage:
cfgve [-t tpl] [-m manager] [-o object] [-r]
cfgve [-t nw] [-m manager] [-o object] [-c -d data center | -r]
cfgve [-t sd] [-m manager] [-o object] [-c | -g | -s | -a | -b | -r -f]
-t: sd - 'Storage Domain', nw - 'Network', tpl -'Template'
-m: FQDN (Fully Qualified Domain Name) of the rhev manager
-o: Target object to configure",
"cfghost" =>
"Usage:
cfghost noderange [-a | -n | -p | -e | -d | -r -f]",
);
my $vers = xCAT::Utils->Version();
my %version = (

46
xCAT-server/lib/xcat/plugins/rhevm.pm
View File

@@ -22,6 +22,7 @@
# domain, for user/group management
#TODO: handle the functions base on the version
#TODO: handle the datacenter and cluster management
#TODO: add the support of iscsi storage domain
@@ -50,6 +51,7 @@ use XML::LibXML;
use xCAT::Table;
use xCAT::MsgUtils;
use xCAT::Usage;
sub handled_commands{
return {
@@ -101,8 +103,16 @@ sub preprocess_request {
if ($extraargs) {
@ARGV=@{$extraargs};
GetOptions("V" => \$verbose);
my $help;
GetOptions("V" => \$verbose, 'h|help' => \$help);
$global_callback = $callback;
if ($help) {
my $usage_string = xCAT::Usage->getUsage($command);
my $rsp;
push @{$rsp->{data}}, $usage_string;
xCAT::MsgUtils->message("I", $rsp, $callback);
return ();
}
}
# Read the user password for the rhevm
@@ -986,14 +996,8 @@ sub displaysrc {
}
}
if ($value =~ /^|.*|$/) {
unless (grep /|$curval|/, $value) {
next;
}
} else {
unless ($curval eq $value) {
next;
}
unless ($curval eq $value) {
next;
}
}
@@ -1090,6 +1094,10 @@ sub lsve {
unless ($rc) {
displaysrc($callback, $ref_rhevm, $response, "networks", " ", "dc=$dcid");
}
($rc, $id, $stat, $response) = search_src($ref_rhevm, "templates", "datacenter%3D$obj");
unless ($rc) {
displaysrc($callback, $ref_rhevm, $response, "templates", " ");
}
}
} elsif ($type eq "cl") {
my ($rc, $id, $stat, $response) = search_src($ref_rhevm, "clusters", "$obj");
@@ -1319,14 +1327,16 @@ sub cfghost {
my $nodes = shift;
my $args = shift;
my ($approve, $network, $power, $activate, $deactivate);
my ($approve, $network, $power, $activate, $deactivate, $remove, $force);
if ($args) {
@ARGV=@{$args};
GetOptions('a' => \$approve,
'n' => \$network,
'p' => \$power,
'e' => \$activate,
'd' => \$deactivate);
'd' => \$deactivate,
'r' => \$remove,
'f' => \$force);
}
# Set the default user:pw for ipmi
@@ -1532,6 +1542,20 @@ sub cfghost {
xCAT::MsgUtils->message("E", $rsp, $callback);
}
} # end of power management configure
if ($remove) {
if ($force) {
# deactivate the host anyway
activate($callback, $ref_rhevm,"/api/hosts/$hostid", $rhevh, 1);
if (waitforcomplete($ref_rhevm, "/api/hosts/$hostid", "/host/status/state=maintenance", 30)) {
my $rsp;
push @{$rsp->{data}}, "$rhevh: failed to waiting the host gets to \"maintenance\" state.";
xCAT::MsgUtils->message("E", $rsp, $callback);
next;
}
}
generalaction($callback, $ref_rhevm, "/api/hosts/$hostid", "DELETE", 1);
}
}
} # end of for each host
}