From 53dc1cde81f0fe9a4729425047dcbd3fdc0a1bb0 Mon Sep 17 00:00:00 2001 From: Sheng Feng Xing Date: Mon, 14 Oct 2013 15:05:30 +0800 Subject: [PATCH] Do not import lpar node if FSP network associated with it --- perl-xCAT/xCAT/ProfiledNodeUtils.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/ProfiledNodeUtils.pm b/perl-xCAT/xCAT/ProfiledNodeUtils.pm index 179109f7e..1f461ed43 100644 --- a/perl-xCAT/xCAT/ProfiledNodeUtils.pm +++ b/perl-xCAT/xCAT/ProfiledNodeUtils.pm @@ -832,9 +832,15 @@ sub check_profile_consistent{ } if ($profile_dict{$mgt} ne $nictype and $nodetype ne 'lpar') { - # Networkprofile's nictype is not consistent with hadrwareprofile's mgt + # Networkprofile's nictype is not consistent with hadrwareprofile's mgt, and the node type is not lpar return 0, "Networkprofile's nictype is not consistent with hardwareprofile's mgt."; } + + if ($nodetype eq 'lpar' and $nictype eq 'FSP') + { + # can not associate FSP network if the node type is lpar + return 0, "The node with hardware type $nodetype can not use with $nictype networkprofile."; + } return 1, ""; }