From: pborla Date: Wed, 3 Apr 2024 05:09:16 +0000 (+0530) Subject: [Epic-ID: ODUHIGH-538][Issue-ID: ODUHIGH-578] Rename odu_config.xml to fdd_odu_config... X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1cd13b3a192d0f9bfd7474920ac107fceef40558;p=o-du%2Fl2.git [Epic-ID: ODUHIGH-538][Issue-ID: ODUHIGH-578] Rename odu_config.xml to fdd_odu_config.xml and Added tdd_odu_config.xml file to support tdd configurations Change-Id: I7bfa1fc547bec3af51bbeb26e06e9b0890b47a6d Signed-off-by: pborla --- diff --git a/build/config/odu_config.xml b/build/config/fdd_odu_config.xml similarity index 99% rename from build/config/odu_config.xml rename to build/config/fdd_odu_config.xml index 50527dea4..d61ad427d 100644 --- a/build/config/odu_config.xml +++ b/build/config/fdd_odu_config.xml @@ -689,7 +689,7 @@ 10 1 - 1 + 0 5 60000 + 1 + 1 + + + + 3 + 1 + 1 + + + 4 + 8 + 0 + + + + 2 + + + 1 + + 2 + 3 + 4 + + + + 5 + + 6 + 7 + 8 + + + + + + 1 + 1 + 3000000 + 1 + 1 + + + 1 + TRUE + 44 + + + 0 + 0 + + + + + 0 + 273 + 1 + 0 + + + + 1 + 0 + 0 + 0 + 8192 + + 8 + 4 + 2 + 1 + 0 + + + 1 + + + 2 + + + 0 + 0 + 3 + 11 + + + 1 + 0 + 3 + 11 + + + + + + + 0 + 273 + 1 + 0 + + + 0 + 0 + + + 2 + + + 4 + 0 + 3 + 11 + + + 5 + 0 + 3 + 11 + + + + + + + 0 + 0 + 24 + 2 + 0 + + 1 + + + 0 + + 0 + 1 + 2 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 1 + 30 + 88 + 1 + + + 0 + 1 + 0 + 4 + + + 0 + 1 + 63 + 8 + 273 + 24 + 31 + 10 + + + 6 + 7 + 12 + 2 + 1 + + + 1 + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 1 + + 0 + 1 + + + + 3 + 1 + 1 + + + 4 + 8 + 0 + + + + 1 + + 2 + 3 + 4 + + + + + 90 + 30 + 10 + + + + + + 2 + + 1 + + + 1 + 1 + + + 192.168.130.81 + 36421 + 192.168.130.80 + 36421 + 2 + + + 1 + + + 1 + + ORAN-E2SM-KPM + 1.3.6.1.4.1.53148.1.2.2.2 + KPM Monitor + + 0 + 1 + + + 1 + Periodic Report + 1 + + + 1 + + + + 1 + E2 Node Measurement + 1 + + + + 1 + RRU.PrbTotDl + + + 2 + RRU.PrbTotUl + + + + + 1 + 1 + + + + + 10 + 2 + 0 + 5 + 60000 + + + + + diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index ed8a5fd17..b5d63451f 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -1019,7 +1019,6 @@ uint8_t parseF1NrFddInfo(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, F1NrFddInfo return ROK; } -#ifdef NR_TDD /******************************************************************* * * @brief Fill NR TDD Info @@ -1064,7 +1063,6 @@ uint8_t parseF1NrTddInfo(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, F1NrTddInfo } return ROK; } -#endif /******************************************************************* * @@ -1097,10 +1095,9 @@ uint8_t parseNrModeInfo(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, NrModeInfo * strcpy((char*)modeCfg, (char*)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1)); } -#ifndef NR_TDD - if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_FDD_INFO")) && (cur->ns == ns)) + if(strcmp(modeCfg, "FDD") == 0) { - if(strcmp(modeCfg, "FDD") == 0) + if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_FDD_INFO")) && (cur->ns == ns)) { if(parseF1NrFddInfo(doc, ns, cur, &nrModeInfo->mode.fdd) != ROK) { @@ -1108,10 +1105,9 @@ uint8_t parseNrModeInfo(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, NrModeInfo * } } } -#else - if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_TDD_INFO")) && (cur->ns == ns)) + else { - if(strcmp(modeCfg, "TDD") == 0) + if ((!xmlStrcmp(cur->name, (const xmlChar *)"F1_NR_TDD_INFO")) && (cur->ns == ns)) { if(parseF1NrTddInfo(doc, ns, cur, &nrModeInfo->mode.tdd) != ROK) { @@ -1120,7 +1116,6 @@ uint8_t parseNrModeInfo(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, NrModeInfo * } } -#endif cur = cur -> next; } return ROK; @@ -1898,7 +1893,7 @@ uint8_t parseCarrierCfg(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur,CarrierCfg *c if ((!xmlStrcmp(cur->name, (const xmlChar *)"NR_DL_ARFCN")) && (cur->ns == ns)) { - carrierCfg->arfcnDL = convertArfcnToFreqKhz(atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1))); + carrierCfg->arfcnDL = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1)); } if ((!xmlStrcmp(cur->name, (const xmlChar *)"UL_BW")) && (cur->ns == ns)) @@ -1908,7 +1903,7 @@ uint8_t parseCarrierCfg(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur,CarrierCfg *c if ((!xmlStrcmp(cur->name, (const xmlChar *)"NR_UL_ARFCN")) && (cur->ns == ns)) { - carrierCfg->arfcnUL = convertArfcnToFreqKhz(atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1))); + carrierCfg->arfcnUL = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1)); } #endif @@ -5381,7 +5376,11 @@ uint8_t parseDuCfgParams(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) * ****************************************************************/ uint8_t duReadCfg() { - const char *filename = "../build/config/odu_config.xml"; +#ifdef NR_TDD + const char *filename = "../build/config/tdd_odu_config.xml"; +#else + const char *filename = "../build/config/fdd_odu_config.xml"; +#endif xmlDocPtr doc = NULLP; xmlNodePtr cur = NULLP; xmlNsPtr ns = NULLP;