Skip to content

Commit

Permalink
Rename common parameters
Browse files Browse the repository at this point in the history
TECHNOLOGY to NE_TECHNOLOGY
NETYPE to NE_TYPE
VENDOR to NE_VENDOR
VERSION to NE_VERSION.

The reason for this is some MOs have parameters with the
same names.
  • Loading branch information
erssebaggala committed Dec 13, 2018
1 parent 7fc96d2 commit b952851
Showing 1 changed file with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*/
public class HuaweiCMObjectParser {

final static String VERSION = "1.0.7";
final static String VERSION = "1.0.8";

Logger logger = LoggerFactory.getLogger(HuaweiCMObjectParser.class);

Expand Down Expand Up @@ -254,7 +254,7 @@ public class HuaweiCMObjectParser {

/**
* Add meta fields to each MO.
* FILENAME,DATETIME,TECHNOLOGY,VENDOR,VERSION,NETYPE
* FILENAME,DATETIME,NE_TECHNOLOGY,NE_VENDOR,NE_VERSION,NE_TYPE
*/
private Boolean extractMetaFields = false;

Expand Down Expand Up @@ -447,7 +447,7 @@ public void displayMOsAndParameters(){
String moParameterListString = moName + ":";

if( extractMetaFields == true ){
moParameterListString += "FILENAME,DATETIME,TECHNOLOGY,VENDOR,VERSION,NETYPE";
moParameterListString += "FILENAME,DATETIME,NE_TECHNOLOGY,NE_VENDOR,NE_VERSION,NE_TYPE";
}

int size = moParameterList.size();
Expand Down Expand Up @@ -742,7 +742,7 @@ public void endELementEvent(XMLEvent xmlEvent)
//Extract parameter values when paramete rfile is not provided
if (qName.equals("object") && parameterFile == null) {
objectDepth--;
String paramNames = "FILENAME,DATETIME,TECHNOLOGY,VENDOR,VERSION,NETYPE";
String paramNames = "FILENAME,DATETIME,NE_TECHNOLOGY,NE_VENDOR,NE_VERSION,NE_TYPE";
String paramValues = baseFileName + "," + dateTime + "," + technology + "," + vendor + "," + version + "," + nodeTypeVersion;

if (!moiPrintWriters.containsKey(className) ) {
Expand Down Expand Up @@ -849,13 +849,13 @@ public void endELementEvent(XMLEvent xmlEvent)

if(moiName.equals("FILENAME")){
paramValues += "," + baseFileName;
}else if(moiName.equals("TECHNOLOGY")){
}else if(moiName.equals("NE_TECHNOLOGY")){
paramValues += "," + technology;
}else if(moiName.equals("VENDOR")){
}else if(moiName.equals("NE_VENDOR")){
paramValues += "," + vendor;
}else if(moiName.equals("VERSION")){
}else if(moiName.equals("NE_VERSION")){
paramValues += "," + version;
}else if(moiName.equals("NETYPE")){
}else if(moiName.equals("NE_TYPE")){
paramValues += "," + nodeTypeVersion;
}else if(moiName.equals("DATETIME")){
paramValues += "," + dateTime;
Expand Down Expand Up @@ -1043,12 +1043,12 @@ public static void main(String[] args) {
Boolean onlyExtractParameters = false;
Boolean showHelpMessage = false;
Boolean showVersion = false;
Boolean attachMetaFields = false; //Attach mattachMetaFields FILENAME,DATETIME,TECHNOLOGY,VENDOR,VERSION,NETYPE
Boolean attachMetaFields = false; //Attach mattachMetaFields FILENAME,DATETIME,NE_TECHNOLOGY,NE_VENDOR,NE_VERSION,NE_TYPE

try{
options.addOption( "p", "extract-parameters", false, "extract only the managed objects and parameters" );
options.addOption( "v", "version", false, "display version" );
options.addOption( "m", "meta-fields", false, "add meta fields to extracted parameters. FILENAME,DATETIME,TECHNOLOGY,VENDOR,VERSION,NETYPE" );
options.addOption( "m", "meta-fields", false, "add meta fields to extracted parameters. FILENAME,DATETIME,NE_TECHNOLOGY,NE_VENDOR,NE_VERSION,NE_TYPE" );
options.addOption( Option.builder("i")
.longOpt( "input-file" )
.desc( "input file or directory name")
Expand Down

0 comments on commit b952851

Please sign in to comment.