database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Reformat all code to coding standard

Browse Source
This commit is contained in:
Andrew Hutchings
2017-10-26 17:18:17 +01:00
parent 4985f3456e
commit 01446d1e22
1296 changed files with 403852 additions and 353747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19620
oam/oamcpp/liboamcpp.cpp
View File

File diff suppressed because it is too large Load Diff

4682
oam/oamcpp/liboamcpp.h
View File

File diff suppressed because it is too large Load Diff

415
oam/oamcpp/oamcache.cpp
View File

@ -37,19 +37,21 @@ using namespace boost;
namespace
{
oam::OamCache *oamCache = 0;
mutex cacheLock;
oam::OamCache* oamCache = 0;
mutex cacheLock;
}
namespace oam
{
OamCache * OamCache::makeOamCache()
OamCache* OamCache::makeOamCache()
{
mutex::scoped_lock lk(cacheLock);
if (oamCache == 0)
oamCache = new OamCache();
return oamCache;
mutex::scoped_lock lk(cacheLock);
if (oamCache == 0)
oamCache = new OamCache();
return oamCache;
}
OamCache::OamCache() : mtime(0), mLocalPMId(0)
@ -60,262 +62,285 @@ OamCache::~OamCache()
void OamCache::checkReload()
{
Oam oam;
config::Config *config = config::Config::makeConfig();
int temp;
Oam oam;
config::Config* config = config::Config::makeConfig();
int temp;
if (config->getCurrentMTime() == mtime)
return;
if (config->getCurrentMTime() == mtime)
return;
dbroots.clear();
oam.getSystemDbrootConfig(dbroots);
dbroots.clear();
oam.getSystemDbrootConfig(dbroots);
string txt = config->getConfig("SystemConfig", "DBRootCount");
mtime = config->getLastMTime(); // get 'last' after the first access; quicker than 'current'
idbassert(txt != "");
numDBRoots = config->fromText(txt);
string txt = config->getConfig("SystemConfig", "DBRootCount");
mtime = config->getLastMTime(); // get 'last' after the first access; quicker than 'current'
idbassert(txt != "");
numDBRoots = config->fromText(txt);
dbRootPMMap.reset(new map<int, int>());
dbRootPMMap.reset(new map<int, int>());
//cout << "reloading oamcache\n";
for (uint32_t i = 0; i < dbroots.size(); i++) {
oam.getDbrootPmConfig(dbroots[i], temp);
//cout << " dbroot " << dbroots[i] << " -> PM " << temp << endl;
(*dbRootPMMap)[dbroots[i]] = temp;
}
//cout << "reloading oamcache\n";
for (uint32_t i = 0; i < dbroots.size(); i++)
{
oam.getDbrootPmConfig(dbroots[i], temp);
//cout << " dbroot " << dbroots[i] << " -> PM " << temp << endl;
(*dbRootPMMap)[dbroots[i]] = temp;
}
ModuleTypeConfig moduletypeconfig;
std::set<int> uniquePids;
oam.getSystemConfig("pm", moduletypeconfig);
int moduleID = 0;
for (unsigned i = 0; i < moduletypeconfig.ModuleCount; i++) {
moduleID = atoi((moduletypeconfig.ModuleNetworkList[i]).DeviceName.substr(MAX_MODULE_TYPE_SIZE,MAX_MODULE_ID_SIZE).c_str());
uniquePids.insert(moduleID);
}
std::set<int>::const_iterator it = uniquePids.begin();
moduleIds.clear();
uint32_t i = 0;
map<int, int> pmToConnectionMap;
ModuleTypeConfig moduletypeconfig;
std::set<int> uniquePids;
oam.getSystemConfig("pm", moduletypeconfig);
int moduleID = 0;
for (unsigned i = 0; i < moduletypeconfig.ModuleCount; i++)
{
moduleID = atoi((moduletypeconfig.ModuleNetworkList[i]).DeviceName.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE).c_str());
uniquePids.insert(moduleID);
}
std::set<int>::const_iterator it = uniquePids.begin();
moduleIds.clear();
uint32_t i = 0;
map<int, int> pmToConnectionMap;
#ifdef _MSC_VER
moduleIds.push_back(*it);
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);
pmToConnectionMap[*it] = i++;
#else
// Restore for Windows when we support multiple PMs
while (it != uniquePids.end())
{
while (it != uniquePids.end())
{
#if !defined(SKIP_OAM_INIT)
{
try {
int state = oam::MAN_INIT;
bool degraded;
char num[80];
int retry = 0;
// MCOL-259 retry for 5 seconds if the PM is in some INIT mode.
while (( state == oam::BUSY_INIT
|| state == oam::MAN_INIT
|| state == oam::PID_UPDATE)
&& retry < 5)
{
snprintf(num, 80, "%d", *it);
try {
oam.getModuleStatus(string("pm") + num, state, degraded);
}
catch (std::exception& e)
{
ostringstream os;
os << "OamCache::checkReload exception while getModuleStatus pm" << num << " " << e.what();
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
catch (...) {
ostringstream os;
os << "OamCache::checkReload exception while getModuleStatus pm" << num;
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
{
try
{
int state = oam::MAN_INIT;
bool degraded;
char num[80];
int retry = 0;
if (state == oam::ACTIVE || state == oam::DEGRADED) {
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);
break;
}
sleep(1);
//cout << "pm " << *it << " -> connection " << (i-1) << endl;
}
if (state != oam::ACTIVE)
{
ostringstream os;
os << "OamCache::checkReload shows state for pm" << num << " as " << oamState[state];
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
}
}
catch (std::exception& e)
{
ostringstream os;
os << "OamCache::checkReload final exception while getModuleStatus " << e.what();
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
catch (...) {
ostringstream os;
os << "OamCache::checkReload final exception while getModuleStatus";
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
}
// MCOL-259 retry for 5 seconds if the PM is in some INIT mode.
while (( state == oam::BUSY_INIT
|| state == oam::MAN_INIT
|| state == oam::PID_UPDATE)
&& retry < 5)
{
snprintf(num, 80, "%d", *it);
try
{
oam.getModuleStatus(string("pm") + num, state, degraded);
}
catch (std::exception& e)
{
ostringstream os;
os << "OamCache::checkReload exception while getModuleStatus pm" << num << " " << e.what();
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
catch (...)
{
ostringstream os;
os << "OamCache::checkReload exception while getModuleStatus pm" << num;
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
if (state == oam::ACTIVE || state == oam::DEGRADED)
{
pmToConnectionMap[*it] = i++;
moduleIds.push_back(*it);
break;
}
sleep(1);
//cout << "pm " << *it << " -> connection " << (i-1) << endl;
}
if (state != oam::ACTIVE)
{
ostringstream os;
os << "OamCache::checkReload shows state for pm" << num << " as " << oamState[state];
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
}
}
catch (std::exception& e)
{
ostringstream os;
os << "OamCache::checkReload final exception while getModuleStatus " << e.what();
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
catch (...)
{
ostringstream os;
os << "OamCache::checkReload final exception while getModuleStatus";
oam.writeLog(os.str(), logging::LOG_TYPE_ERROR);
break;
}
}
#else
moduleIds.push_back(*it);
moduleIds.push_back(*it);
#endif
it++;
}
#endif
dbRootConnectionMap.reset(new map<int, int>());
for (i = 0; i < dbroots.size(); i++)
{
map<int, int>::iterator pmIter = pmToConnectionMap.find((*dbRootPMMap)[dbroots[i]]);
if (pmIter != pmToConnectionMap.end())
{
(*dbRootConnectionMap)[dbroots[i]] = (*pmIter).second;
}
}
it++;
pmDbrootsMap.reset(new OamCache::PMDbrootsMap_t::element_type());
systemStorageInfo_t t;
t = oam.getStorageConfig();
DeviceDBRootList moduledbrootlist = boost::get<2>(t);
DeviceDBRootList::iterator pt = moduledbrootlist.begin();
for( ; pt != moduledbrootlist.end() ; pt++)
{
moduleID = (*pt).DeviceID;
DBRootConfigList::iterator pt1 = (*pt).dbrootConfigList.begin();
for( ; pt1 != (*pt).dbrootConfigList.end(); pt1++)
{
(*pmDbrootsMap)[moduleID].push_back(*pt1);
}
}
oamModuleInfo_t tm;
tm = oam.getModuleInfo();
OAMParentModuleName = boost::get<3>(tm);
systemName = config->getConfig("SystemConfig", "SystemName");
}
#endif
dbRootConnectionMap.reset(new map<int, int>());
for (i = 0; i < dbroots.size(); i++)
{
map<int, int>::iterator pmIter = pmToConnectionMap.find((*dbRootPMMap)[dbroots[i]]);
if (pmIter != pmToConnectionMap.end())
{
(*dbRootConnectionMap)[dbroots[i]] = (*pmIter).second;
}
}
pmDbrootsMap.reset(new OamCache::PMDbrootsMap_t::element_type());
systemStorageInfo_t t;
t = oam.getStorageConfig();
DeviceDBRootList moduledbrootlist = boost::get<2>(t);
DeviceDBRootList::iterator pt = moduledbrootlist.begin();
for ( ; pt != moduledbrootlist.end() ; pt++)
{
moduleID = (*pt).DeviceID;
DBRootConfigList::iterator pt1 = (*pt).dbrootConfigList.begin();
for ( ; pt1 != (*pt).dbrootConfigList.end(); pt1++)
{
(*pmDbrootsMap)[moduleID].push_back(*pt1);
}
}
oamModuleInfo_t tm;
tm = oam.getModuleInfo();
OAMParentModuleName = boost::get<3>(tm);
systemName = config->getConfig("SystemConfig", "SystemName");
}
OamCache::dbRootPMMap_t OamCache::getDBRootToPMMap()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
checkReload();
return dbRootPMMap;
checkReload();
return dbRootPMMap;
}
OamCache::dbRootPMMap_t OamCache::getDBRootToConnectionMap()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
checkReload();
return dbRootConnectionMap;
checkReload();
return dbRootConnectionMap;
}
OamCache::PMDbrootsMap_t OamCache::getPMToDbrootsMap()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
checkReload();
return pmDbrootsMap;
checkReload();
return pmDbrootsMap;
}
uint32_t OamCache::getDBRootCount()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
checkReload();
return numDBRoots;
checkReload();
return numDBRoots;
}
DBRootConfigList& OamCache::getDBRootNums()
{
mutex::scoped_lock lk(cacheLock);
{
mutex::scoped_lock lk(cacheLock);
checkReload();
return dbroots;
checkReload();
return dbroots;
}
std::vector<int>& OamCache::getModuleIds()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
checkReload();
return moduleIds;
checkReload();
return moduleIds;
}
std::string OamCache::getOAMParentModuleName()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
checkReload();
return OAMParentModuleName;
checkReload();
return OAMParentModuleName;
}
int OamCache::getLocalPMId()
{
mutex::scoped_lock lk(cacheLock);
// This comes from the file $INSTALL/local/module, not from the xml.
// Thus, it's not refreshed during checkReload().
if (mLocalPMId > 0)
{
return mLocalPMId;
}
mutex::scoped_lock lk(cacheLock);
string localModule;
string moduleType;
string fileName = startup::StartUp::installDir() + "/local/module";
ifstream moduleFile (fileName.c_str());
char line[400];
while (moduleFile.getline(line, 400))
{
localModule = line;
break;
}
moduleFile.close();
// This comes from the file $INSTALL/local/module, not from the xml.
// Thus, it's not refreshed during checkReload().
if (mLocalPMId > 0)
{
return mLocalPMId;
}
if (localModule.empty() )
{
mLocalPMId = 0;
return mLocalPMId;
}
string localModule;
string moduleType;
string fileName = startup::StartUp::installDir() + "/local/module";
ifstream moduleFile (fileName.c_str());
char line[400];
moduleType = localModule.substr(0,MAX_MODULE_TYPE_SIZE);
mLocalPMId = atoi(localModule.substr(MAX_MODULE_TYPE_SIZE,MAX_MODULE_ID_SIZE).c_str());
if (moduleType != "pm")
{
mLocalPMId = 0;
}
while (moduleFile.getline(line, 400))
{
localModule = line;
break;
}
return mLocalPMId;
moduleFile.close();
if (localModule.empty() )
{
mLocalPMId = 0;
return mLocalPMId;
}
moduleType = localModule.substr(0, MAX_MODULE_TYPE_SIZE);
mLocalPMId = atoi(localModule.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE).c_str());
if (moduleType != "pm")
{
mLocalPMId = 0;
}
return mLocalPMId;
}
string OamCache::getSystemName()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
checkReload();
return systemName;
checkReload();
return systemName;
}
string OamCache::getModuleName()
{
mutex::scoped_lock lk(cacheLock);
mutex::scoped_lock lk(cacheLock);
if (!moduleName.empty())
return moduleName;
if (!moduleName.empty())
return moduleName;
string fileName = startup::StartUp::installDir() + "/local/module";
ifstream moduleFile(fileName.c_str());
getline(moduleFile, moduleName);
moduleFile.close();
string fileName = startup::StartUp::installDir() + "/local/module";
ifstream moduleFile(fileName.c_str());
getline(moduleFile, moduleName);
moduleFile.close();
return moduleName;
return moduleName;
}
} /* namespace oam */

68
oam/oamcpp/oamcache.h
View File

@ -35,44 +35,48 @@
namespace oam
{
class OamCache {
class OamCache
{
public:
typedef boost::shared_ptr<std::map<int, int> > dbRootPMMap_t;
typedef std::vector<int> dbRoots;
typedef boost::shared_ptr<std::map<int, dbRoots> > PMDbrootsMap_t;
EXPORT virtual ~OamCache();
typedef boost::shared_ptr<std::map<int, int> > dbRootPMMap_t;
typedef std::vector<int> dbRoots;
typedef boost::shared_ptr<std::map<int, dbRoots> > PMDbrootsMap_t;
EXPORT virtual ~OamCache();
EXPORT void checkReload();
EXPORT void forceReload() {mtime=0;}
EXPORT void checkReload();
EXPORT void forceReload()
{
mtime = 0;
}
EXPORT dbRootPMMap_t getDBRootToPMMap();
EXPORT dbRootPMMap_t getDBRootToConnectionMap();
EXPORT PMDbrootsMap_t getPMToDbrootsMap();
EXPORT uint32_t getDBRootCount();
EXPORT DBRootConfigList& getDBRootNums();
EXPORT std::vector<int> & getModuleIds();
EXPORT static OamCache * makeOamCache();
EXPORT std::string getOAMParentModuleName();
EXPORT int getLocalPMId(); // return the PM id of this machine.
EXPORT std::string getSystemName();
EXPORT std::string getModuleName();
EXPORT dbRootPMMap_t getDBRootToPMMap();
EXPORT dbRootPMMap_t getDBRootToConnectionMap();
EXPORT PMDbrootsMap_t getPMToDbrootsMap();
EXPORT uint32_t getDBRootCount();
EXPORT DBRootConfigList& getDBRootNums();
EXPORT std::vector<int>& getModuleIds();
EXPORT static OamCache* makeOamCache();
EXPORT std::string getOAMParentModuleName();
EXPORT int getLocalPMId(); // return the PM id of this machine.
EXPORT std::string getSystemName();
EXPORT std::string getModuleName();
private:
OamCache();
OamCache(const OamCache &);
OamCache & operator=(const OamCache &) const;
OamCache();
OamCache(const OamCache&);
OamCache& operator=(const OamCache&) const;
dbRootPMMap_t dbRootPMMap;
dbRootPMMap_t dbRootConnectionMap;
PMDbrootsMap_t pmDbrootsMap;
uint32_t numDBRoots;
time_t mtime;
DBRootConfigList dbroots;
std::vector<int> moduleIds;
std::string OAMParentModuleName;
int mLocalPMId; // The PM id running on this machine
std::string systemName;
std::string moduleName;
dbRootPMMap_t dbRootPMMap;
dbRootPMMap_t dbRootConnectionMap;
PMDbrootsMap_t pmDbrootsMap;
uint32_t numDBRoots;
time_t mtime;
DBRootConfigList dbroots;
std::vector<int> moduleIds;
std::string OAMParentModuleName;
int mLocalPMId; // The PM id running on this machine
std::string systemName;
std::string moduleName;
};
} /* namespace */

28
oam/oamcpp/resource.h
View File

@ -1,14 +1,14 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by liboamcpp.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by liboamcpp.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

634
oam/oamcpp/tdriver.cpp
View File

@ -16,7 +16,7 @@
MA 02110-1301, USA. */
/***************************************************************************
* dhill@srvengcm1.calpont.com
* dhill@srvengcm1.calpont.com
*
* Purpose: OAM C++ API tester
*
@ -43,49 +43,53 @@ using namespace oam;
using namespace alarmmanager;
class getModuleInfoTest : public CppUnit::TestFixture {
class getModuleInfoTest : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( getModuleInfoTest );
CPPUNIT_TEST_SUITE( getModuleInfoTest );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST_SUITE_END();
CPPUNIT_TEST_SUITE_END();
private:
string Svalue;
int Ivalue;
bool Bvalue;
string Svalue;
int Ivalue;
bool Bvalue;
public:
void setUp() {
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
void setUp()
{
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
// setenv("CALPONT_HOME", "/home/dhill/genii/export/etc/", 1);
}
}
void tearDown() {
}
void tearDown()
{
}
void test1() {
void test1()
{
Oam oamapi;
Svalue = oamapi.getCurrentTime();
cout << "Current time is " << Svalue;
CPPUNIT_ASSERT(!Svalue.empty());
Oam oamapi;
Svalue = oamapi.getCurrentTime();
cout << "Current time is " << Svalue;
CPPUNIT_ASSERT(!Svalue.empty());
Bvalue = oamapi.isValidIP("111.222.333.444");
CPPUNIT_ASSERT(Bvalue == true);
Bvalue = oamapi.isValidIP("111.222.333.444");
CPPUNIT_ASSERT(Bvalue == true);
Bvalue = oamapi.isValidIP("111.222.333");
CPPUNIT_ASSERT(Bvalue == false);
Bvalue = oamapi.isValidIP("111.222.333");
CPPUNIT_ASSERT(Bvalue == false);
Bvalue = oamapi.isValidIP("1.2.3.4");
CPPUNIT_ASSERT(Bvalue == true);
Bvalue = oamapi.isValidIP("1.2.3.4");
CPPUNIT_ASSERT(Bvalue == true);
Bvalue = oamapi.isValidIP("1.2.3.4444");
CPPUNIT_ASSERT(Bvalue == false);
Bvalue = oamapi.isValidIP("1.2.3.4444");
CPPUNIT_ASSERT(Bvalue == false);
Bvalue = oamapi.isValidIP("1111.222.333.444");
CPPUNIT_ASSERT(Bvalue == false);
Bvalue = oamapi.isValidIP("1111.222.333.444");
CPPUNIT_ASSERT(Bvalue == false);
// can test on deve machine
@ -101,160 +105,172 @@ public:
// Ivalue = get<2>(t);
// CPPUNIT_ASSERT(Ivalue == MASTER_YES);
};
};
};
};
class getSystemConfigTest : public CppUnit::TestFixture {
class getSystemConfigTest : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( getSystemConfigTest );
CPPUNIT_TEST_SUITE( getSystemConfigTest );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test2 );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test2 );
//CPPUNIT_TEST( test3 );
//CPPUNIT_TEST( test4 );
//CPPUNIT_TEST( test5 );
CPPUNIT_TEST_EXCEPTION( test6, std::runtime_error );
CPPUNIT_TEST_EXCEPTION( test6, std::runtime_error );
//CPPUNIT_TEST_EXCEPTION( test7, std::runtime_error );
CPPUNIT_TEST( test8 );
CPPUNIT_TEST_EXCEPTION( test9, std::runtime_error );
CPPUNIT_TEST( test10 );
CPPUNIT_TEST( test8 );
CPPUNIT_TEST_EXCEPTION( test9, std::runtime_error );
CPPUNIT_TEST( test10 );
CPPUNIT_TEST_SUITE_END();
CPPUNIT_TEST_SUITE_END();
private:
string Svalue;
int Ivalue;
string Svalue;
int Ivalue;
public:
void setUp() {
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
void setUp()
{
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
// setenv("CALPONT_HOME", "/home/dhill/genii/export/etc/", 1);
}
}
void tearDown() {
}
void tearDown()
{
}
void test1() {
SystemConfig systemconfig;
void test1()
{
SystemConfig systemconfig;
Oam oamapi;
oamapi.getSystemConfig(systemconfig);
Oam oamapi;
oamapi.getSystemConfig(systemconfig);
Ivalue = systemconfig.ModuleHeartbeatPeriod;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemconfig.ModuleHeartbeatPeriod;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemconfig.ModuleHeartbeatCount;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemconfig.ModuleHeartbeatCount;
CPPUNIT_ASSERT(Ivalue != -1);
// Ivalue = systemconfig.ProcessHeartbeatPeriod;
// CPPUNIT_ASSERT(Ivalue != -2);
Svalue = systemconfig.NMSIPAddr;
CPPUNIT_ASSERT(!Svalue.empty());
};
Svalue = systemconfig.NMSIPAddr;
CPPUNIT_ASSERT(!Svalue.empty());
};
void test2() {
SystemModuleTypeConfig systemmoduletypeconfig;
void test2()
{
SystemModuleTypeConfig systemmoduletypeconfig;
Oam oamapi;
oamapi.getSystemConfig(systemmoduletypeconfig);
Oam oamapi;
oamapi.getSystemConfig(systemmoduletypeconfig);
for( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
{
if( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
// end of list
break;
for ( unsigned int i = 0 ; i < systemmoduletypeconfig.moduletypeconfig.size(); i++)
{
if ( systemmoduletypeconfig.moduletypeconfig[i].ModuleType.empty() )
// end of list
break;
Svalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleType;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleDesc;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleDesc;
CPPUNIT_ASSERT(!Svalue.empty());
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCount;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUCriticalThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUCriticalThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMajorThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMajorThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMinorThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMinorThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMinorClearThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
}
};
Ivalue = systemmoduletypeconfig.moduletypeconfig[i].ModuleCPUMinorClearThreshold;
CPPUNIT_ASSERT(Ivalue != -1);
}
};
/* void test3() {
ModuleConfig moduleconfig;
const string Modulename = "dm1";
/* void test3() {
ModuleConfig moduleconfig;
const string Modulename = "dm1";
Oam oamapi;
oamapi.getSystemConfig(Modulename, moduleconfig);
Oam oamapi;
oamapi.getSystemConfig(Modulename, moduleconfig);
Svalue = moduleconfig.ModuleName;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = moduleconfig.ModuleName;
CPPUNIT_ASSERT(!Svalue.empty());
};
*/
void test4() {
ModuleConfig moduleconfig;
};
*/
void test4()
{
ModuleConfig moduleconfig;
Oam oamapi;
oamapi.getSystemConfig(moduleconfig);
Oam oamapi;
oamapi.getSystemConfig(moduleconfig);
Svalue = moduleconfig.ModuleName;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = moduleconfig.ModuleName;
CPPUNIT_ASSERT(!Svalue.empty());
};
};
void test5() {
Oam oamapi;
oamapi.setSystemConfig("SystemVersion", "V2.0.2.3");
void test5()
{
Oam oamapi;
oamapi.setSystemConfig("SystemVersion", "V2.0.2.3");
oamapi.getSystemConfig("SystemVersion", Svalue);
oamapi.getSystemConfig("SystemVersion", Svalue);
CPPUNIT_ASSERT(Svalue == "V2.0.2.3");
};
CPPUNIT_ASSERT(Svalue == "V2.0.2.3");
};
void test6() {
Oam oamapi;
oamapi.getSystemConfig("SystemVersionBad", Svalue);
CPPUNIT_ASSERT(Svalue.size() == 0);
};
void test6()
{
Oam oamapi;
oamapi.getSystemConfig("SystemVersionBad", Svalue);
CPPUNIT_ASSERT(Svalue.size() == 0);
};
void test7() {
Oam oamapi;
oamapi.setSystemConfig("SystemVersionBad", "V2.0.2.3");
};
void test7()
{
Oam oamapi;
oamapi.setSystemConfig("SystemVersionBad", "V2.0.2.3");
};
void test8() {
Oam oamapi;
oamapi.setSystemConfig("ModuleHeartbeatPeriod", 5);
void test8()
{
Oam oamapi;
oamapi.setSystemConfig("ModuleHeartbeatPeriod", 5);
oamapi.getSystemConfig("ModuleHeartbeatPeriod", Ivalue);
oamapi.getSystemConfig("ModuleHeartbeatPeriod", Ivalue);
CPPUNIT_ASSERT(Ivalue == 5);
};
CPPUNIT_ASSERT(Ivalue == 5);
};
void test9() {
Oam oamapi;
oamapi.getSystemConfig("ModuleHeartbeatPeriodBad", Ivalue);
CPPUNIT_ASSERT(Ivalue == 0);
};
void test9()
{
Oam oamapi;
oamapi.getSystemConfig("ModuleHeartbeatPeriodBad", Ivalue);
CPPUNIT_ASSERT(Ivalue == 0);
};
void test10() {
Oam oamapi;
oamapi.setSystemConfig("ModuleCPUMajorThreshold1", 7500);
void test10()
{
Oam oamapi;
oamapi.setSystemConfig("ModuleCPUMajorThreshold1", 7500);
oamapi.getSystemConfig("ModuleCPUMajorThreshold1", Ivalue);
oamapi.getSystemConfig("ModuleCPUMajorThreshold1", Ivalue);
CPPUNIT_ASSERT(Ivalue == 7500);
};
CPPUNIT_ASSERT(Ivalue == 7500);
};
};
@ -336,132 +352,148 @@ public:
};
*/
class getProcessConfigTest : public CppUnit::TestFixture {
class getProcessConfigTest : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( getProcessConfigTest );
CPPUNIT_TEST_SUITE( getProcessConfigTest );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test2 );
CPPUNIT_TEST_EXCEPTION( test3, std::runtime_error );
CPPUNIT_TEST( test4 );
CPPUNIT_TEST_EXCEPTION( test5, std::runtime_error );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test2 );
CPPUNIT_TEST_EXCEPTION( test3, std::runtime_error );
CPPUNIT_TEST( test4 );
CPPUNIT_TEST_EXCEPTION( test5, std::runtime_error );
CPPUNIT_TEST_SUITE_END();
CPPUNIT_TEST_SUITE_END();
private:
string Svalue;
int Ivalue;
string Svalue;
int Ivalue;
public:
void setUp() {
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
void setUp()
{
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
// setenv("CALPONT_HOME", "/home/dhill/genii/export/etc/", 1);
}
}
void tearDown() {
}
void tearDown()
{
}
void test1() {
SystemProcessConfig systemprocessconfig;
void test1()
{
SystemProcessConfig systemprocessconfig;
Oam oamapi;
oamapi.getProcessConfig(systemprocessconfig);
Oam oamapi;
oamapi.getProcessConfig(systemprocessconfig);
for( unsigned int i = 0 ; i < systemprocessconfig.processconfig.size(); i++)
{
Svalue = systemprocessconfig.processconfig[i].ProcessName;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemprocessconfig.processconfig[i].ModuleType;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemprocessconfig.processconfig[i].ProcessLocation;
CPPUNIT_ASSERT(!Svalue.empty());
for ( unsigned int i = 0 ; i < systemprocessconfig.processconfig.size(); i++)
{
Svalue = systemprocessconfig.processconfig[i].ProcessName;
CPPUNIT_ASSERT(!Svalue.empty());
for( int j = 0 ; j < oam::MAX_ARGUMENTS; j++) {
if (systemprocessconfig.processconfig[i].ProcessArgs[j].empty())
break;
Svalue = systemprocessconfig.processconfig[i].ProcessArgs[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
Svalue = systemprocessconfig.processconfig[i].ModuleType;
CPPUNIT_ASSERT(!Svalue.empty());
Ivalue = systemprocessconfig.processconfig[i].BootLaunch;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = systemprocessconfig.processconfig[i].LaunchID;
CPPUNIT_ASSERT(Ivalue != -1);
for( int j = 0 ; j < MAX_DEPENDANCY; j++) {
if (systemprocessconfig.processconfig[i].DepProcessName[j].empty())
break;
Svalue = systemprocessconfig.processconfig[i].DepProcessName[j];
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemprocessconfig.processconfig[i].DepModuleName[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
}
};
Svalue = systemprocessconfig.processconfig[i].ProcessLocation;
CPPUNIT_ASSERT(!Svalue.empty());
void test2() {
ProcessConfig processconfig;
for ( int j = 0 ; j < oam::MAX_ARGUMENTS; j++)
{
if (systemprocessconfig.processconfig[i].ProcessArgs[j].empty())
break;
Oam oamapi;
oamapi.getProcessConfig("ProcessManager", "dm1", processconfig);
Svalue = processconfig.ProcessName;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemprocessconfig.processconfig[i].ProcessArgs[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
Svalue = processconfig.ModuleType;
CPPUNIT_ASSERT(!Svalue.empty());
Ivalue = systemprocessconfig.processconfig[i].BootLaunch;
CPPUNIT_ASSERT(Ivalue != -1);
Svalue = processconfig.ProcessLocation;
CPPUNIT_ASSERT(!Svalue.empty());
Ivalue = systemprocessconfig.processconfig[i].LaunchID;
CPPUNIT_ASSERT(Ivalue != -1);
for( int j = 0 ; j < oam::MAX_ARGUMENTS; j++) {
if (processconfig.ProcessArgs[j].empty())
break;
Svalue = processconfig.ProcessArgs[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
for ( int j = 0 ; j < MAX_DEPENDANCY; j++)
{
if (systemprocessconfig.processconfig[i].DepProcessName[j].empty())
break;
Ivalue = processconfig.BootLaunch;
CPPUNIT_ASSERT(Ivalue != -1);
Svalue = systemprocessconfig.processconfig[i].DepProcessName[j];
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemprocessconfig.processconfig[i].DepModuleName[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
}
};
Ivalue = processconfig.LaunchID;
CPPUNIT_ASSERT(Ivalue != -1);
void test2()
{
ProcessConfig processconfig;
for( int j = 0 ; j < MAX_DEPENDANCY; j++) {
if (processconfig.DepProcessName[j].empty())
break;
Svalue = processconfig.DepProcessName[j];
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = processconfig.DepModuleName[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
};
Oam oamapi;
oamapi.getProcessConfig("ProcessManager", "dm1", processconfig);
void test3() {
ProcessConfig processconfig;
Oam oamapi;
oamapi.getProcessConfig("SNMPTrapDaemonBAD", "dm1", processconfig);
CPPUNIT_ASSERT(Svalue.size() == 0);
};
Svalue = processconfig.ProcessName;
CPPUNIT_ASSERT(!Svalue.empty());
void test4() {
Oam oamapi;
oamapi.setProcessConfig("ProcessManager", "dm1", "BootLaunch", 10);
Svalue = processconfig.ModuleType;
CPPUNIT_ASSERT(!Svalue.empty());
oamapi.getProcessConfig("ProcessManager", "dm1", "BootLaunch", Ivalue);
Svalue = processconfig.ProcessLocation;
CPPUNIT_ASSERT(!Svalue.empty());
CPPUNIT_ASSERT(Ivalue == 10);
};
for ( int j = 0 ; j < oam::MAX_ARGUMENTS; j++)
{
if (processconfig.ProcessArgs[j].empty())
break;
void test5() {
ProcessConfig processconfig;
Oam oamapi;
oamapi.getProcessConfig("ProcessManager", "dm1", "ModuleTypeBAD", Svalue);
CPPUNIT_ASSERT(Svalue.size() == 0);
};
Svalue = processconfig.ProcessArgs[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
Ivalue = processconfig.BootLaunch;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = processconfig.LaunchID;
CPPUNIT_ASSERT(Ivalue != -1);
for ( int j = 0 ; j < MAX_DEPENDANCY; j++)
{
if (processconfig.DepProcessName[j].empty())
break;
Svalue = processconfig.DepProcessName[j];
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = processconfig.DepModuleName[j];
CPPUNIT_ASSERT(!Svalue.empty());
}
};
void test3()
{
ProcessConfig processconfig;
Oam oamapi;
oamapi.getProcessConfig("SNMPTrapDaemonBAD", "dm1", processconfig);
CPPUNIT_ASSERT(Svalue.size() == 0);
};
void test4()
{
Oam oamapi;
oamapi.setProcessConfig("ProcessManager", "dm1", "BootLaunch", 10);
oamapi.getProcessConfig("ProcessManager", "dm1", "BootLaunch", Ivalue);
CPPUNIT_ASSERT(Ivalue == 10);
};
void test5()
{
ProcessConfig processconfig;
Oam oamapi;
oamapi.getProcessConfig("ProcessManager", "dm1", "ModuleTypeBAD", Svalue);
CPPUNIT_ASSERT(Svalue.size() == 0);
};
};
/*
@ -498,16 +530,16 @@ public:
{
Svalue = systemprocessstatus.processstatus[i].ProcessName;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemprocessstatus.processstatus[i].Module;
CPPUNIT_ASSERT(!Svalue.empty());
Ivalue = systemprocessstatus.processstatus[i].ProcessID;
CPPUNIT_ASSERT(Ivalue != -1);
Svalue = systemprocessstatus.processstatus[i].StateChangeDate;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = systemprocessstatus.processstatus[i].ProcessOpState;
CPPUNIT_ASSERT(!Svalue.empty());
@ -518,7 +550,7 @@ public:
ProcessStatus processstatus;
oamapi.getProcessStatus("ProcessManager", "dm1", processstatus);
Svalue = processstatus.ProcessName;
CPPUNIT_ASSERT(!Svalue.empty());
@ -533,7 +565,7 @@ public:
Svalue = processstatus.ProcessOpState;
CPPUNIT_ASSERT(!Svalue.empty());
};
void test3() {
@ -565,83 +597,89 @@ public:
};
*/
class getAlarmConfigTest : public CppUnit::TestFixture {
class getAlarmConfigTest : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( getAlarmConfigTest );
CPPUNIT_TEST_SUITE( getAlarmConfigTest );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test2 );
CPPUNIT_TEST_EXCEPTION( test3, std::runtime_error );
CPPUNIT_TEST( test1 );
CPPUNIT_TEST( test2 );
CPPUNIT_TEST_EXCEPTION( test3, std::runtime_error );
//CPPUNIT_TEST( test4 );
CPPUNIT_TEST_SUITE_END();
CPPUNIT_TEST_SUITE_END();
private:
string Svalue;
int Ivalue;
string Svalue;
int Ivalue;
public:
void setUp() {
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
void setUp()
{
setenv("CALPONT_HOME", "/home/buildslave/Buildbot/nightly/export/etc/", 1);
// setenv("CALPONT_HOME", "/home/dhill/genii/export/etc/", 1);
}
}
void tearDown() {
}
void tearDown()
{
}
void test1() {
AlarmConfig alarmconfig;
Oam oamapi;
void test1()
{
AlarmConfig alarmconfig;
Oam oamapi;
for( int alarmID = 1 ; alarmID < MAX_ALARM_ID; alarmID++)
{
oamapi.getAlarmConfig(alarmID, alarmconfig);
for ( int alarmID = 1 ; alarmID < MAX_ALARM_ID; alarmID++)
{
oamapi.getAlarmConfig(alarmID, alarmconfig);
Svalue = alarmconfig.BriefDesc;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = alarmconfig.BriefDesc;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = alarmconfig.DetailedDesc;
CPPUNIT_ASSERT(!Svalue.empty());
Svalue = alarmconfig.Severity;
CPPUNIT_ASSERT(!Svalue.empty());
Ivalue = alarmconfig.Threshold;
CPPUNIT_ASSERT(Ivalue != -1);
Ivalue = alarmconfig.Occurrences;
CPPUNIT_ASSERT(Ivalue != -1);
Svalue = alarmconfig.LastIssueTime;
CPPUNIT_ASSERT(!Svalue.empty());
}
};
Svalue = alarmconfig.DetailedDesc;
CPPUNIT_ASSERT(!Svalue.empty());
void test2() {
Oam oamapi;
oamapi.setAlarmConfig(CPU_USAGE_MED, "Threshold", 20);
Svalue = alarmconfig.Severity;
CPPUNIT_ASSERT(!Svalue.empty());
oamapi.getAlarmConfig(CPU_USAGE_MED, "Threshold", Ivalue);
Ivalue = alarmconfig.Threshold;
CPPUNIT_ASSERT(Ivalue != -1);
CPPUNIT_ASSERT(Ivalue == 20);
};
Ivalue = alarmconfig.Occurrences;
CPPUNIT_ASSERT(Ivalue != -1);
void test3() {
Oam oamapi;
oamapi.getAlarmConfig(CPU_USAGE_MED, "ThresholdBAD", Ivalue);
CPPUNIT_ASSERT(Ivalue == 0);
};
Svalue = alarmconfig.LastIssueTime;
CPPUNIT_ASSERT(!Svalue.empty());
}
};
/* void test4() {
// test getActiveAlarm API
AlarmList activeAlarm;
#if 1
Oam oamapi;
oamapi.getActiveAlarms (activeAlarm);
#endif
};
*/
};
void test2()
{
Oam oamapi;
oamapi.setAlarmConfig(CPU_USAGE_MED, "Threshold", 20);
oamapi.getAlarmConfig(CPU_USAGE_MED, "Threshold", Ivalue);
CPPUNIT_ASSERT(Ivalue == 20);
};
void test3()
{
Oam oamapi;
oamapi.getAlarmConfig(CPU_USAGE_MED, "ThresholdBAD", Ivalue);
CPPUNIT_ASSERT(Ivalue == 0);
};
/* void test4() {
// test getActiveAlarm API
AlarmList activeAlarm;
#if 1
Oam oamapi;
oamapi.getActiveAlarms (activeAlarm);
#endif
};
*/
};
CPPUNIT_TEST_SUITE_REGISTRATION( getModuleInfoTest );
CPPUNIT_TEST_SUITE_REGISTRATION( getSystemConfigTest );
@ -653,13 +691,13 @@ CPPUNIT_TEST_SUITE_REGISTRATION( getAlarmConfigTest );
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
int main( int argc, char **argv)
int main( int argc, char** argv)
{
CppUnit::TextUi::TestRunner runner;
CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
runner.addTest( registry.makeTest() );
bool wasSuccessful = runner.run( "", false );
return (wasSuccessful ? 0 : 1);
CppUnit::TextUi::TestRunner runner;
CppUnit::TestFactoryRegistry& registry = CppUnit::TestFactoryRegistry::getRegistry();
runner.addTest( registry.makeTest() );
bool wasSuccessful = runner.run( "", false );
return (wasSuccessful ? 0 : 1);
}