Enable backwards compatibility for CFGI and other configuration files.

Change-Id: Iae866072e6ef3b6325e097d84debdfa20e31c5f7
Signed-off-by: Rafael Rocha <rafael.rocha.vidaurri@intel.com>

Author: Rafael Rocha

contrib/platform/intel/hillsboro/orcm-linux.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
-    <version>3</version>
+    <version>3.1</version>
     <role>RECORD</role>
     <junction>
         <type>cluster</type>

orcm/mca/analytics/base/analytics_base_frame.c

@@ -237,8 +237,11 @@ static void orcm_analytics_base_load_default_workflows(void)
     orcm_value_t *list_item = NULL;
     char *file = NULL;
 
-
-    if (NULL == (file = strdup(orcm_cfgi_base.config_file))) {
+    if( 3 < orcm_cfgi_base.version ) {
+        if (NULL == (file = strdup(orcm_cfgi_base.config_file))) {
+            return;
+        }
+    } else if (0 > asprintf(&file, "%s/etc/orcm-default-config.xml", opal_install_dirs.prefix)) {
         return;
     }
 

orcm/mca/cfgi/base/base.h

@@ -39,6 +39,7 @@ typedef struct {
     int ping_rate;
     bool validate;
     char *port_number;
+    float version;
 } orcm_cfgi_base_t;
 ORCM_DECLSPEC extern orcm_cfgi_base_t orcm_cfgi_base;
 

orcm/mca/cfgi/file10/cfgi_file10.c

@@ -97,6 +97,7 @@ static int file10_read_version(opal_list_t *result_list, int num_loop)
 
     /*restrict the "version" tag to be checked for one loop */
     if (1 < num_loop) {
+        orcm_cfgi_base.version = 1.0;
         return ORCM_SUCCESS;
     }
 

orcm/mca/cfgi/file30/cfgi_file30.c

@@ -129,6 +129,7 @@ static void file30_init_error_cleanup(opal_list_t *config)
 static int file30_init(void)
 {
     int ret;
+    float fversion = 0;
 
     ret = file30_open_config_file();
     if (ret != ORCM_SUCCESS) {
@@ -154,12 +155,14 @@ static int file30_init(void)
         return return_error(ORCM_ERR_TAKE_NEXT_OPTION, "BAD PARSING OF VERSION DATA");
     }
 
-    if( '3' != version->value.data.string[0]){
+    fversion = atof(version->value.data.string);
+    if( fversion < 3.0 || fversion >= 4.0 ){
         opal_output(0, "EXPECTED VERSION 3 NOT FOUND: %s", version->value.data.string);
         file30_init_error_cleanup(config);
         return return_error(ORCM_ERR_TAKE_NEXT_OPTION, "VERSION 3 NOT FOUND");
     }
 
+    orcm_cfgi_base.version = fversion;
     SAFE_RELEASE_NESTED_LIST(config);
     return ORCM_SUCCESS;
 }

orcm/mca/sensor/ipmi/ipmi_parser.cpp

@@ -64,7 +64,12 @@ ipmiParser::ipmiParser(const string& file)
 void ipmiParser::setFile(const string& file)
 {
     if (file.empty()){
-        this->file = orcm_cfgi_base.config_file;
+        if( 3 < orcm_cfgi_base.version ) {
+            this->file = orcm_cfgi_base.config_file;
+        } else {
+            string prefix = (NULL != opal_install_dirs.prefix)? string(opal_install_dirs.prefix) : "";
+            this->file = prefix + string("/etc/") + string("orcm-default-config.xml");
+        }
     } else {
         this->file = file;
     }

orcm/mca/sensor/snmp/snmp_parser.cpp

@@ -63,7 +63,12 @@ void snmpParser::setParseFile(const string& filePath)
 {
     unsetParseFile();
     if( filePath.empty()){
-        this->file = orcm_cfgi_base.config_file;
+        if( 3 < orcm_cfgi_base.version ) {
+            this->file = orcm_cfgi_base.config_file;
+        } else {
+            string prefix = (NULL != opal_install_dirs.prefix)? string(opal_install_dirs.prefix) : "";
+            this->file = prefix + string("/etc/") + string("orcm-default-config.xml");
+        }
     } else {
         file = filePath;
     }

orcm/test/mca/sensor/snmp/snmp_parser_tests.cpp

@@ -67,6 +67,7 @@ void ut_snmp_parser_tests::removeTestFiles()
 
 TEST_F(ut_snmp_parser_tests, parse_default_file){
     orcm_cfgi_base.config_file = strdup(SNMP_DEFAULT_FILE_NAME);
+    orcm_cfgi_base.version = 3.1;
 
     snmpParser sp; // It will take the default snmp configuration file.
     sp.getSnmpCollectorVector();
@@ -76,6 +77,7 @@ TEST_F(ut_snmp_parser_tests, parse_default_file){
 
 TEST_F(ut_snmp_parser_tests, parse_no_file){
     orcm_cfgi_base.config_file = strdup(SNMP_DEFAULT_FILE_NAME);
+    orcm_cfgi_base.version = 3.1;
 
     char *prefix = opal_install_dirs.prefix;
     opal_install_dirs.prefix = NULL;

orcm/util/logical_group.c

@@ -129,8 +129,13 @@ static int orcm_logical_group_init(char *config_file)
     int erri = ORCM_SUCCESS;
 
     if (NULL == config_file) {
-        if (-1 == (erri = asprintf(&(LOGICAL_GROUP.storage_filename),
-                   "%s", orcm_cfgi_base.config_file))) {
+        if( 3 < orcm_cfgi_base.version ) {
+            if (-1 == (erri = asprintf(&(LOGICAL_GROUP.storage_filename),
+                                       "%s", orcm_cfgi_base.config_file))) {
+                return ORCM_ERR_OUT_OF_RESOURCE;
+            }
+        } else if (-1 == (erri = asprintf(&(LOGICAL_GROUP.storage_filename),
+                   "%s/etc/orcm-default-config.xml", opal_install_dirs.prefix))) {
             return ORCM_ERR_OUT_OF_RESOURCE;
         }
     } else if (NULL == (LOGICAL_GROUP.storage_filename = strdup(config_file))) {
@@ -695,6 +700,7 @@ static int orcm_logical_group_open_file(char *storage_filename)
 static int orcm_logical_group_crate_xml_file(char *storage_filename)
 {
     FILE *storage_fp = NULL;
+    int res = 0;
 
     if (NULL == storage_filename || '\0' == storage_filename[0]) {
         ORCM_UTIL_ERROR_MSG("Bad setup for parsing logical groupings.");
@@ -707,7 +713,13 @@ static int orcm_logical_group_crate_xml_file(char *storage_filename)
         return ORCM_ERR_FILE_OPEN_FAILURE;
     }
     else {
-        if (0 > fprintf(storage_fp, "<configuration />")) {
+        if( 3 < orcm_cfgi_base.version ) {
+            res = fprintf(storage_fp, "<configuration />");
+        } else {
+            res = fprintf(storage_fp, "<logicalgroup />");
+        }
+
+        if (0 > res) {
             fclose(storage_fp);
             return ORCM_ERR_FILE_WRITE_FAILURE;
         }