xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

enhance xcatprobe discovery sub command

Browse Source
This commit is contained in:
XuWei
2016-10-20 03:23:22 -04:00
parent 684babe436
commit 90bb2a2639
3 changed files with 1296 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-probe/lib/perl/LogParse.pm
View File

@@ -489,12 +489,20 @@ sub obtain_log_content {
$log_content{label} = $::LOGLABEL_DHCPD;
} elsif ($split_line[2] =~ /in.tftpd/i) {
$log_content{label} = $::LOGLABEL_TFTP;
} elsif ($split_line[2] =~ /^xcat.genesis.doxcat/i or $split_line[3] =~ /^xcat.genesis.doxcat/i) {
$log_content{label} = $::LOGLABEL_DOXCAT;
} elsif ($split_line[2] =~ /^xcat.genesis.dodiscovery/i or $split_line[3] =~ /^xcat.genesis.dodiscovery/i) {
$log_content{label} = $::LOGLABEL_DISCOVERY;
} elsif ($split_line[2] =~ /^xcat/i) {
$log_content{label} = $::LOGLABEL_XCAT;
} else {
$log_content{label} = $::LOGLABEL_UNDEF;
}
$log_content{msg} = join(" ", @split_line[ 3 .. @split_line - 1 ]);
if ($split_line[3] =~ /^xcat.genesis.doxcat/i or $split_line[3] =~ /^xcat.genesis.dodiscovery/i) {
$log_content{msg} = join(" ", @split_line[ 4 .. @split_line - 1 ]);
} else {
$log_content{msg} = join(" ", @split_line[ 3 .. @split_line - 1 ]);
}
} else {
my $timestamp = join(" ", @split_line[ 0 .. 2 ]);
$log_content{time} = $self->convert_to_epoch_seconds($timestamp);
@@ -508,12 +516,20 @@ sub obtain_log_content {
$log_content{label} = $::LOGLABEL_DHCPD;
} elsif ($split_line[4] =~ /in.tftpd/i) {
$log_content{label} = $::LOGLABEL_TFTP;
} elsif ($split_line[4] =~ /^xcat/i) {
} elsif ($split_line[4] =~ /^xcat.genesis.doxcat/i or $split_line[5] =~ /^xcat.genesis.doxcat/i) {
$log_content{label} = $::LOGLABEL_DOXCAT;
} elsif ($split_line[4] =~ /^xcat.genesis.dodiscovery/i or $split_line[5] =~ /^xcat.genesis.dodiscovery/i) {
$log_content{label} = $::LOGLABEL_DISCOVERY;
} elsif ($split_line[4] =~ /^xcat/i or $split_line[5] =~ /^xcat/i) {
$log_content{label} = $::LOGLABEL_XCAT;
} else {
$log_content{label} = $::LOGLABEL_UNDEF;
}
$log_content{msg} = join(" ", @split_line[ 5 .. @split_line - 1 ]);
if ($split_line[5] =~ /^xcat.genesis.doxcat/i or $split_line[5] =~ /^xcat.genesis.dodiscovery/i) {
$log_content{msg} = join(" ", @split_line[ 6 .. @split_line - 1 ]);
} else {
$log_content{msg} = join(" ", @split_line[ 5 .. @split_line - 1 ]);
}
}
} elsif ($log_type == $::LOGTYPE_HTTP) {
$split_line[3] =~ s/^\[(.+)/$1/g;

36
xCAT-probe/lib/perl/probe_global_constant.pm
View File

@@ -7,11 +7,13 @@ $::LOGTYPE_RSYSLOG = 0; #rsyslog
$::LOGTYPE_HTTP = 1; #apache log
#The lable of specific line log
$::LOGLABEL_DHCPD = 0;
$::LOGLABEL_TFTP = 1;
$::LOGLABEL_HTTP = 2;
$::LOGLABEL_XCAT = 3;
$::LOGLABEL_UNDEF = 4;
$::LOGLABEL_DHCPD = 0;
$::LOGLABEL_TFTP = 1;
$::LOGLABEL_HTTP = 2;
$::LOGLABEL_XCAT = 3;
$::LOGLABEL_UNDEF = 4;
$::LOGLABEL_DOXCAT = 5;
$::LOGLABEL_DISCOVERY = 6;
#The important stage of provision process
$::STATE_POWER_ON = 1;
@@ -44,4 +46,28 @@ $::STATE_COMPLETED = 13;
$::STATE_POSTBOOTSCRIPT => "running_postbootscripts",
$::STATE_COMPLETED => "complete",
);
# The important stage of discovery process
$::STATE_DISCOVER_DHCP = 1;
$::STATE_DISCOVER_BOOTLODER = 2;
$::STATE_DISCOVER_KERNEL = 3;
$::STATE_DISCOVER_INITRD = 4;
$::STATE_DISCOVER_DOXCAT = 5;
$::STATE_DISCOVER_DISCOVERY = 6;
$::STATE_DISCOVER_REPORT = 7;
$::STATE_DISCOVER_COMPLETED = 8;
#The description of every important stage of discovery process
%::STATE_DISCOVER_DESC = (
$::STATE_DISCOVER_DHCP => "got_ip_from_dhcp",
$::STATE_DISCOVER_BOOTLODER => "download_genesis_bootloder",
$::STATE_DISCOVER_KERNEL => "download_genesis_kernel",
$::STATE_DISCOVER_INITRD => "download_genesis_initrd",
$::STATE_DISCOVER_DOXCAT => "enter_genesis",
$::STATE_DISCOVER_DISCOVERY => "start_to_discovery",
$::STATE_DISCOVER_REPORT => "send_discovery_request",
$::STATE_DISCOVER_COMPLETED => "discovery_complete",
);
1;

2130
xCAT-probe/subcmds/discovery
View File

File diff suppressed because it is too large Load Diff