Add huawei motree cm parser #139

erssebaggala · web-flow · commit e5de3e6a0f7f · 2019-10-28T18:41:17.000+03:00
diff --git a/background/background-process.html b/background/background-process.html
@@ -345,6 +345,32 @@ <h1>Background process</h1>
 }
 
 
+
+/**
+* Clean Huawei GExport files.
+*
+*	sed -i -r "
+*	s/<MO className="(BSC6900GSM|BSC6900UMTS|BSC6900GU|BSC6910GSM|BSC6910UMTS|BSC6910GU)(.*)/<MO className="\1/ig;
+*	" /mediation/data/cm/huawei/raw/motree/*.xml
+*
+* @exportFolder String Folder with the MO Tree dump XML files to be cleaned
+*/
+cleanHuaweiMOTreeFiles = async (exportFolder) => {	
+	const replaceOptions = {
+	  files: path.join(exportFolder,'*'),
+	  from: [
+		/<MO className="(BSC6900GSM|BSC6900UMTS|BSC6900GU|BSC6910GSM|BSC6910UMTS|BSC6910GU)/g
+	  ],
+	  to: [
+		"<MO className=\""
+	  ],
+	};
+	
+	return await replace.sync(replaceOptions)
+}
+
+
+
 /*Use gnu sed.exe on windows
 * 
 */
@@ -379,6 +405,42 @@ <h1>Background process</h1>
 
 }
 
+
+/*
+* Clean Huawei MO Tree XML files.
+* @param string inputFolder
+*/
+cleanHuaweiMOTreeWithSed = (inputFolder) => {
+	let libPath = app.getAppPath();
+
+	if (!isDev) {
+	  libPath = process.resourcesPath;
+	} 
+	
+	let files = fs.readdirSync(inputFolder,  { withFileTypes: true }).filter(dirent => !dirent.isDirectory()).map(dirent => dirent.name);
+		
+	const sedScript = path.join(libPath,'libraries', 'motree_cleanup.sed');
+	const sed = path.join(libPath,'libraries','sed.exe');
+		
+	for (let i=0; i<files.length; i++) {
+		f = files[i];
+		inputFile = path.join(inputFolder,f);
+		
+		log.info(`Cleaning ${f}...`);
+		sendLogToUI('parse_data','info', `Cleaning  ${f}...`);
+		
+		const child = spawnSync(sed, ['-i', '-r', '-f', sedScript, inputFile]);
+		log.info(`${sed} -i -r -f ${sedScript} ${inputFile}`);
+
+		if(child.error){
+			log.info(`[parse_cm_job] error:${child.error.toString()}`);
+			throw child.error.toString();
+		}
+	}
+
+}
+
+
 /*
 * Take the latest file when there is more than one file from the same node .
 *
@@ -460,7 +522,7 @@ <h1>Background process</h1>
 			removeDublicateHuaweiGExportFiles(inputFolder)
 						
 			log.info(`[parse_cm_job] Uncompressing files GExport XML files...`)
-			sendLogToUI('parse_data','info',`Uncompressing files GExport XML files...` );
+			sendLogToUI('parse_data','info',"Uncompressing files GExport XML files...");
 			
 			uncompressFolder(inputFolder);
 			
@@ -488,17 +550,53 @@ <h1>Background process</h1>
 		}
 		
 	}
+	
+	//Clean Huawei MOTree files 
+	else if(vendor === 'HUAWEI' && format === 'MOTREE_XML'){
+		try{
+						
+			log.info(`Uncompressing files MOTree XML files...`);
+			sendLogToUI('parse_data','info', "Uncompressing files MOTree XML files...");
+			
+			uncompressFolder(inputFolder);
+			
+			log.info(`Uncompressing files MOTree XML files...`)
+			sendLogToUI('parse_data','info',"Cleaning MOTree XML files...");
+			
+			if(process.platform === "win32"){
+				//If windows test, with sed.exe 
+				cleanHuaweiMOTreeWithSed(inputFolder);
+			}else{
+				await cleanHuaweiMOTreeFiles(inputFolder);
+			}
+			
+			log.info(`Cleanup of MOTree XML files completed.`);
+			sendLogToUI('parse_data','info',"Cleanup of MOTree XML files completed.");
+			
+		}catch(error){
+			log.error('Error occurred:', error);
+			if(typeof error === 'undefined'){
+				sendLogToUI('parse_data','error', 'Error occured.');
+				return;
+			}
+			sendLogToUI('parse_data','error',error.toString());
+			return;
+		}
+		
+	}
+	
+	
 	//Uncompress files for other vendor format combinations except huawei gexport 
 	//The reason for this is we want to first remove the duplicates in the dumps, before wasting time 
 	//uncompressing what does not need to be uncompressed 
-	//else if(vendor !== 'HUAWEI' && format !== 'GEXPORT_XML'){
+	//else if(vendor !== 'HUAWEI' && (format !== 'GEXPORT_XML' || format !== 'MOTREE_XML')){
 	else{
-		sendLogToUI('parse_data','info',`Uncompressing files...` );
-		log.info(`Uncompressing files...`)
+		sendLogToUI('parse_data','info',"Uncompressing files...");
+		log.info("Uncompressing files...")
 		uncompressFolder(inputFolder);
 	}
 	
-	sendLogToUI('parse_data','info', `Parsing files...`);
+	sendLogToUI('parse_data','info', "Parsing files...");
 	log.info("Parsing files...")
 	
 
diff --git a/background/boda-cell-file.js b/background/boda-cell-file.js
@@ -80,7 +80,8 @@ const BCF_4G_PARAMS = {
 	longitude: {required: true},
 	height: {},
 	vendor: {},
-	cell_type: {}
+	cell_type: {},
+	localcellid: {}
 };
 
 const BCF_5G_PARAMS = {
diff --git a/background/tems.js b/background/tems.js
@@ -181,11 +181,10 @@ function generateParameterInsertQuery(fields, values){
 	
 	paramNames.forEach((p, i) => {
 	
-		
 		//Skip parameter that are not there
 		if(fields.indexOf(p) === -1 ) return;
 
-		paramValues[i] = values[fields.indexOf(p)];
+		paramValues[i] = values[fields.indexOf(p)] === undefined ? "" : values[fields.indexOf(p)];
 		updatePhrase.push(`${p} = EXCLUDED.${p}`);
 	});
 	
@@ -197,8 +196,7 @@ function generateParameterInsertQuery(fields, values){
 	 SET 
 		${updatePhrase.join(",")}
 	`;
-	
-	//console.log(sql)
+
 	return sql;
 
 }
@@ -429,7 +427,9 @@ async function loadXMLFile(fileName){	//@TODO: Confirm file is XML
 		"longitude",
 		"height",
 		"vendor",
-		"cell_type"
+		"cell_type",
+		"ci",
+		"localcellid"
 	]
 	
 	//GSM_CELL
@@ -647,7 +647,10 @@ async function loadXMLFile(fileName){	//@TODO: Confirm file is XML
 			
 			if(child.nodeName === 'LOCALCELLID') paramValues['localcellid'] = child.firstChild.data;
 			
+			//pci
 			if(child.nodeName === 'PCI') paramValues['pci'] = child.firstChild.data;
+			if(child.nodeName === 'PHYSICAL_LAYER_CELL_ID') paramValues['pci'] = child.firstChild.data;
+			
 			
 			if(child.nodeName === 'EARFCN_DL') paramValues['euarfcn'] = child.firstChild.data;
 			
@@ -668,6 +671,22 @@ async function loadXMLFile(fileName){	//@TODO: Confirm file is XML
 			
 			if(child.nodeName === 'ENODE_B_STATUS') paramValues['status'] = child.firstChild.data;
 
+			//CGI
+			if(child.nodeName === 'LTE_CGI'){
+				const children2 = child.childNodes;
+				for(var j =0; j < children2.length; j++){
+					const child2 = children2[j];
+					
+					if( typeof child2.localName === 'undefined') continue;
+					
+					if(child2.nodeName === 'MCC') paramValues['mcc'] = child2.firstChild.data;
+					if(child2.nodeName === 'MNC') paramValues['mnc'] = child2.firstChild.data;
+					if(child2.nodeName === 'TAC') paramValues['tac'] = child2.firstChild.data;
+				}
+				
+				paramValues['cgi'] = `${paramValues["mcc"]}-${paramValues["mnc"]}-${paramValues["lac"]}-${paramValues["ci"]}`
+			}
+			
 			//POSITION
 			if(child.nodeName === 'POSITION'){
 				const children2 = child.childNodes;
@@ -699,10 +718,14 @@ async function loadXMLFile(fileName){	//@TODO: Confirm file is XML
 		paramValues['technology'] = 'lte';
 		paramValues['node'] = paramValues['siteid'] || "ENODEB";
 		
-		const bcfLTEValues  = lteBcfFields.map(v => paramValues[v] || '');
+		paramValues['ci'] = paramValues['ci'] || paramValues['pci'];
+		paramValues['localcellid'] = paramValues['localcellid'] === undefined ? "0" : '';
 		
-		const InsertQry = generateParameterInsertQuery(lteBcfFields, bcfLTEValues);
-		await queryHelper.runQuery(InsertQry);
+		const bcfLTEValues  = lteBcfFields.map(v => paramValues[v] === undefined ? "" : paramValues[v]);
+		
+		const insertQry = generateParameterInsertQuery(lteBcfFields, bcfLTEValues);
+
+		await queryHelper.runQuery(insertQry);
 
 		node = nodes.iterateNext()
 	}
diff --git a/background/vendor-formats.js b/background/vendor-formats.js
@@ -1,6 +1,6 @@
 const VENDOR_CM_FORMATS = {
 	'ERICSSON': ['BULKCM','CNAIV2','BSM','EAW'],
-	'HUAWEI': ['GEXPORT_XML','NBI_XML','CFGMML', 'AUTOBAK_XML'],
+	'HUAWEI': ['GEXPORT_XML','NBI_XML','CFGMML', 'AUTOBAK_XML', 'MOTREE_XML'],
 	'ZTE': ['BULKCM','XLS'],
 	'NOKIA': ['RAML'],
 	'BODASTAGE': ['BCF_CSV']
@@ -35,7 +35,8 @@ const VENDOR_CM_PARSERS = {
 		'GEXPORT_XML': 'boda-huaweicmobjectparser.jar',
 		'CFGMML': 'boda-huaweimmlparser.jar',
 		'NBI_XML': 'boda-huaweicmxmlparser.jar',
-		'AUTOBAK_XML': 'boda-huaweicfgsynparser.jar'
+		'AUTOBAK_XML': 'boda-huaweicfgsynparser.jar',
+		'MOTREE_XML': 'boda-huaweicmmotreeparser.jar'
 	},
 	'ZTE': {
 		'BULKCM': 'boda-bulkcmparser.jar',
diff --git a/libraries/boda-huaweicmmotreeparser.jar b/libraries/boda-huaweicmmotreeparser.jar
diff --git a/libraries/motree_cleanup.sed b/libraries/motree_cleanup.sed
@@ -0,0 +1 @@
+s/<MO className="(BSC6900GSM|BSC6900UMTS|BSC6900GU|BSC6910GSM|BSC6910UMTS|BSC6910GU)(.*)/<MO className="\2/g;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Boda-Lite",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Boda-Lite is a telecommunication network management application",
   "private": true,
   "homepage": "./",
diff --git a/src/modules/cm/VendorFormats.js b/src/modules/cm/VendorFormats.js
@@ -1,6 +1,6 @@
 export const VENDOR_CM_FORMATS = {
 	'ERICSSON': ['BULKCM','CNAIV2','BSM','EAW'],
-	'HUAWEI': ['GEXPORT_XML','NBI_XML','CFGMML', 'AUTOBAK_XML'],
+	'HUAWEI': ['GEXPORT_XML','NBI_XML','CFGMML', 'AUTOBAK_XML', "MOTREE_XML"],
 	'ZTE': ['BULKCM','XLS'],
 	'NOKIA': ['RAML'],
 	'MOTOROLA': ['CELL_X_EXPORT'],
diff --git a/src/modules/reports/ReportsTree.jsx b/src/modules/reports/ReportsTree.jsx
@@ -102,9 +102,8 @@ class ReportsTree extends React.Component{
                 <Menu>
                     <MenuItem icon="th" text="View report" onClick={(ev) => {ev.preventDefault(); this.showReportDataTab(node.label, node.reportId);}}/>
 					{node.inBuilt === true ? "" : <MenuItem icon="graph-remove" text="Delete report" onClick={(ev) => {ev.preventDefault(); this.removeReport(node.reportId);}}/> }	
-					{node.inBuilt === true || node.type === 'composite' ? 
-						<MenuItem icon="edit" text="Edit report" onClick={(ev) => {ev.preventDefault(); this.createCompositeReport(node.reportId)}} />					: 
-						<MenuItem icon="edit" text="Edit report" onClick={(ev) => {ev.preventDefault(); this.showEditTab(node.reportId)}} /> }	
+					{ node.inBuilt === false && node.type === 'composite' ? <MenuItem icon="edit" text="Edit report" onClick={(ev) => {ev.preventDefault(); this.createCompositeReport(node.reportId)}} /> : "" }
+					{ node.inBuilt === false && node.type !== 'composite' ? <MenuItem icon="edit" text="Edit report" onClick={(ev) => {ev.preventDefault(); this.createCompositeReport(node.reportId)}} /> : "" }
 					
                 </Menu>,
                 { left: e.clientX, top: e.clientY },
diff --git a/src/modules/utilities/KMLGenerator.jsx b/src/modules/utilities/KMLGenerator.jsx
@@ -1247,6 +1247,25 @@ class KMLGenerator extends React.Component {
 				Specify the fields to show in the details popup dialog when each cell is clicked.
 			</div>
 		);
+
+		
+		const radiusHelpContent = (
+			<div>
+				Specifiy the coverage radius in this section. The radius value can be  <br/>
+				manaully in-put, selected from a column in the data file or can depend a series  of conditions
+			</div>
+		);
+		
+		const colorHelpContent = (
+			<div>
+				Pick or provide the color to use for the cell. If the color is manually <br />
+				provided, a <b>hexadecimal</b> color value of the form "<code>#FFFFFF</code>" is <br />
+				expected.
+			</div>
+		);
+		
+		
+		//
 		
 		const processing = this.state.processing || this.props.processing;
 		
@@ -1437,7 +1456,14 @@ class KMLGenerator extends React.Component {
 						  <div>
 								<h6 className="horizontal-line">
 									<span className="horizontal-line-text">
-										Radius <Icon icon="chevron-right" />
+										Radius &nbsp;
+										<AntPopover 
+											content={radiusHelpContent}
+											title={"? Radius"}
+										>
+											<Icon icon="info-sign" />
+										</AntPopover>
+										<Icon icon="chevron-right" />
 									</span>
 								</h6>
 						  </div>
@@ -1454,7 +1480,16 @@ class KMLGenerator extends React.Component {
 							<div>
 								<h6 className="horizontal-line">
 									<span className="horizontal-line-text">
-										Colors <Icon icon="chevron-right" />
+										
+										Colors &nbsp;
+										<AntPopover 
+											content={colorHelpContent}
+											title={"? Color"}
+										>
+											<Icon icon="info-sign" />
+										</AntPopover>
+										<Icon icon="chevron-right" />
+
 									</span>
 								</h6>
 							</div>
diff --git a/src/version.js b/src/version.js
@@ -1,3 +1,3 @@
-export const VERSION = "0.4.2";
+export const VERSION = "0.4.3";
 
 export default VERSION;
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
@@ -64,7 +64,7 @@ class HomeSplash extends React.Component {
         <div className="inner">
           <ProjectTitle siteConfig={siteConfig} />
           <PromoSection>
-            <Button href="https://github.com/bodastage/bts-ce-lite/releases/tag/v0.4.1">Download v0.4.1</Button>
+            <Button href="https://github.com/bodastage/bts-ce-lite/releases/tag/v0.4.2">Download v0.4.2</Button>
             <Button href={docUrl('introduction.html#quick-start')}>Quick start</Button>
           </PromoSection>
         </div>
@@ -95,7 +95,7 @@ class Index extends React.Component {
     //  <div
     //    className="productShowcaseSection paddingBottom"
     //    style={{textAlign: 'center'}}>
-    //    <h2><a href="https://github.com/bodastage/bts-ce-lite/releases">v0.4.1-alpha.5 is available for testing</a></h2>
+    //    <h2><a href="https://github.com/bodastage/bts-ce-lite/releases">v0.4.2-alpha.5 is available for testing</a></h2>
     //    <MarkdownBlock>This is a pre-release version.</MarkdownBlock>
     //  </div>
     //);
diff --git a/website/siteConfig.js b/website/siteConfig.js
@@ -123,7 +123,7 @@ const siteConfig = {
     zIndex: 100,
   },
   
-  defaultVersionShown: '0.4.1',
+  defaultVersionShown: '0.4.2',
   editUrl: 'https://github.com/bodastage/bts-ce-lite/edit/master/docs/',
 };
 
diff --git a/website/versions.json b/website/versions.json
@@ -1,4 +1,5 @@
 [
+  "0.4.2",
   "0.4.1",
   "0.3.1",
   "0.3.0",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+s/<MO className="(BSC6900GSM\|BSC6900UMTS\|BSC6900GU\|BSC6910GSM\|BSC6910UMTS\|BSC6910GU)(.*)/<MO className="\2/g;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Boda-Lite",`
`3`		`- "version": "0.4.2",`
	`3`	`+ "version": "0.4.3",`
`4`	`4`	`"description": "Boda-Lite is a telecommunication network management application",`
`5`	`5`	`"private": true,`
`6`	`6`	`"homepage": "./",`