From 6a5e10492cf09b47463cd38d806c36386a459718 Mon Sep 17 00:00:00 2001 From: Jim Gauld Date: Tue, 18 Sep 2018 12:05:27 -0400 Subject: [PATCH] Decouple Guest-server/agent from stx-metal This decouples the build and packaging of guest-server, guest-agent from mtce, by splitting guest component into stx-nfv repo. This leaves existing C++ code, scripts, and resource files untouched, so there is no functional change. Code refactoring is beyond the scope of this update. Makefiles were modified to include devel headers directories /usr/include/mtce-common and /usr/include/mtce-daemon. This ensures there is no contamination with other system headers. The cgts-mtce-common package is renamed and split into: - repo stx-metal: mtce-common, mtce-common-dev - repo stx-metal: mtce - repo stx-nfv: mtce-guest - repo stx-ha: updates package dependencies to mtce-pmon for service-mgmt, sm, and sm-api mtce-common: - contains common and daemon shared source utility code mtce-common-dev: - based on mtce-common, contains devel package required to build mtce-guest and mtce - contains common library archives and headers mtce: - contains components: alarm, fsmon, fsync, heartbeat, hostw, hwmon, maintenance, mtclog, pmon, public, rmon mtce-guest: - contains guest component guest-server, guest-agent Story: 2002829 Task: 22748 Change-Id: I9c7a9b846fd69fd566b31aa3f12a043c08f19f1f Signed-off-by: Jim Gauld --- centos_iso_image.inc | 14 +- centos_pkg_dirs | 1 + mtce-common/PKG-INFO | 9 +- mtce-common/centos/build_srpm.data | 4 +- mtce-common/centos/mtce-common.spec | 154 ++ mtce-common/cgts-mtce-common-1.0/Makefile | 47 - .../cgts-mtce-common-1.0/guest/Makefile | 48 - .../cgts-mtce-common-1.0/guest/README.txt | 84 - .../cgts-mtce-common-1.0/guest/guestAgent.cpp | 1429 ----------------- .../cgts-mtce-common-1.0/guest/guestBase.h | 319 ---- .../cgts-mtce-common-1.0/guest/guestClass.cpp | 1335 --------------- .../cgts-mtce-common-1.0/guest/guestClass.h | 202 --- .../guest/guestHttpSvr.cpp | 1092 ------------- .../cgts-mtce-common-1.0/guest/guestHttpSvr.h | 27 - .../guest/guestHttpUtil.cpp | 227 --- .../guest/guestHttpUtil.h | 32 - .../guest/guestInstClass.cpp | 764 --------- .../guest/guestInstClass.h | 230 --- .../guest/guestServer.cpp | 580 ------- .../cgts-mtce-common-1.0/guest/guestStubs.cpp | 18 - .../guest/guestSvrFsm.cpp | 93 -- .../guest/guestSvrHdlr.cpp | 1420 ---------------- .../guest/guestSvrMsg.cpp | 784 --------- .../cgts-mtce-common-1.0/guest/guestSvrMsg.h | 27 - .../guest/guestSvrUtil.cpp | 234 --- .../cgts-mtce-common-1.0/guest/guestSvrUtil.h | 18 - .../cgts-mtce-common-1.0/guest/guestUtil.cpp | 330 ---- .../cgts-mtce-common-1.0/guest/guestUtil.h | 34 - .../guest/guestVimApi.cpp | 777 --------- .../cgts-mtce-common-1.0/guest/guestVimApi.h | 47 - .../guest/guestVirtio.cpp | 373 ----- .../cgts-mtce-common-1.0/guest/guestVirtio.h | 24 - .../guest/scripts/guest.ini | 28 - .../guest/scripts/guestAgent | 113 -- .../guest/scripts/guestAgent.logrotate | 16 - .../guest/scripts/guestAgent.ocf | 442 ----- .../guest/scripts/guestAgent.service | 16 - .../guest/scripts/guestAgentTest.sh | 160 -- .../guest/scripts/guestServer | 113 -- .../guest/scripts/guestServer.logrotate | 17 - .../guest/scripts/guestServer.pmon | 25 - .../guest/scripts/guestServer.service | 23 - .../{cgts-mtce-common-1.0 => src}/.gitignore | 0 mtce-common/{ => src}/LICENSE | 0 mtce-common/src/Makefile | 18 + .../common/Makefile | 12 +- .../common/alarmUtil.cpp | 0 .../common/alarmUtil.h | 0 .../common/fitCodes.h | 0 .../common/hostClass.cpp | 0 .../common/hostClass.h | 0 .../common/hostUtil.cpp | 0 .../common/hostUtil.h | 0 .../common/httpUtil.cpp | 1 - .../common/httpUtil.h | 0 .../common/ipmiUtil.cpp | 1 - .../common/ipmiUtil.h | 0 .../common/jsonUtil.cpp | 1 - .../common/jsonUtil.h | 0 .../common/keyClass.cpp | 0 .../common/keyClass.h | 0 .../common/logMacros.h | 0 .../common/msgClass.cpp | 0 .../common/msgClass.h | 0 .../common/nlEvent.cpp | 0 .../common/nlEvent.h | 0 .../common/nodeBase.cpp | 0 .../common/nodeBase.h | 0 .../common/nodeEvent.cpp | 0 .../common/nodeEvent.h | 0 .../common/nodeMacro.h | 0 .../common/nodeTimers.cpp | 0 .../common/nodeTimers.h | 0 .../common/nodeUtil.cpp | 16 - .../common/nodeUtil.h | 0 .../common/pgdbClass.cpp.OBS | 0 .../common/pgdbClass.h.OBS | 0 .../common/pgdbUtil.cpp.OBS | 0 .../common/pingUtil.cpp | 0 .../common/pingUtil.h | 0 .../common/regexUtil.cpp | 0 .../common/regexUtil.h | 0 .../common/returnCodes.h | 0 .../common/threadUtil.cpp | 0 .../common/threadUtil.h | 0 .../common/timeUtil.cpp | 0 .../common/timeUtil.h | 0 .../common/tokenUtil.cpp | 0 .../common/tokenUtil.h | 0 .../daemon/Makefile | 4 +- .../daemon/daemon_common.h | 0 .../daemon/daemon_config.cpp | 0 .../daemon/daemon_debug.cpp | 0 .../daemon/daemon_files.cpp | 0 .../daemon/daemon_ini.cpp | 0 .../daemon/daemon_ini.h | 0 .../daemon/daemon_main.cpp | 0 .../daemon/daemon_option.h | 0 .../daemon/daemon_signal.cpp | 0 mtce/PKG-INFO | 15 + mtce/centos/build_srpm.data | 3 + .../centos/mtce.spec | 205 +-- .../cgts-mtce-common-1.0 => mtce/src}/LICENSE | 0 mtce/src/Makefile | 45 + .../src}/alarm/Makefile | 13 +- .../src}/alarm/alarm.cpp | 0 .../src}/alarm/alarm.h | 0 .../src}/alarm/alarmData.cpp | 0 .../src}/alarm/alarmHdlr.cpp | 0 .../src}/alarm/alarmInit.cpp | 0 .../src}/alarm/alarmMgr.cpp | 0 .../src}/alarm/alarmUtil.cpp | 0 .../src}/alarm/scripts/mtcalarm.init | 0 .../src}/alarm/scripts/mtcalarm.logrotate | 0 .../src}/alarm/scripts/mtcalarm.pmon.conf | 0 .../src}/alarm/scripts/mtcalarm.service | 0 mtce/src/common/Makefile | 40 + .../src}/common/nodeClass.cpp | 15 + .../src}/common/nodeClass.h | 1 + .../src}/common/nodeCmds.h | 0 .../src}/fsmon/Makefile | 10 +- .../src}/fsmon/fsmon.h | 0 .../src}/fsmon/fsmonHdlr.cpp | 0 .../src}/fsmon/fsmonInit.cpp | 0 .../src}/fsmon/scripts/fsmon | 0 .../src}/fsmon/scripts/fsmon.conf | 0 .../src}/fsmon/scripts/fsmon.logrotate | 0 .../src}/fsmon/scripts/fsmon.service | 0 .../src}/fsmon/scripts/fsmond.conf | 0 mtce/src/fsync/Makefile | 23 + .../common => mtce/src/fsync}/fsync.c | 0 .../src}/heartbeat/Makefile | 26 +- .../src}/heartbeat/hbsAgent.cpp | 0 .../src}/heartbeat/hbsAlarm.cpp | 0 .../src}/heartbeat/hbsAlarm.h | 0 .../src}/heartbeat/hbsBase.h | 0 .../src}/heartbeat/hbsClient.cpp | 0 .../src}/heartbeat/hbsPmon.cpp | 0 .../src}/heartbeat/hbsStubs.cpp | 0 .../src}/hostw/Makefile | 10 +- .../src}/hostw/hostw.h | 0 .../src}/hostw/hostwHdlr.cpp | 0 .../src}/hostw/hostwInit.cpp | 0 .../src}/hostw/hostwMsg.cpp | 0 .../src}/hostw/hostwMsg.h | 0 .../src}/hostw/scripts/hostw | 0 .../src}/hostw/scripts/hostw.logrotate | 0 .../src}/hostw/scripts/hostw.service | 0 .../src}/hostw/scripts/hostwd.conf | 0 .../src}/hwmon/Makefile | 9 +- .../src}/hwmon/hp380.cpp | 0 .../src}/hwmon/hwmon.h | 0 .../src}/hwmon/hwmonAlarm.cpp | 0 .../src}/hwmon/hwmonAlarm.h | 0 .../src}/hwmon/hwmonClass.cpp | 0 .../src}/hwmon/hwmonClass.h | 0 .../src}/hwmon/hwmonFsm.cpp | 0 .../src}/hwmon/hwmonGroup.cpp | 0 .../src}/hwmon/hwmonGroup.h | 0 .../src}/hwmon/hwmonHdlr.cpp | 0 .../src}/hwmon/hwmonHttp.cpp | 0 .../src}/hwmon/hwmonHttp.h | 0 .../src}/hwmon/hwmonHttpClient.cpp | 0 .../src}/hwmon/hwmonInit.cpp | 0 .../src}/hwmon/hwmonIpmi.cpp | 0 .../src}/hwmon/hwmonIpmi.h | 0 .../src}/hwmon/hwmonJson.cpp | 0 .../src}/hwmon/hwmonJson.h | 0 .../src}/hwmon/hwmonModel.cpp | 0 .../src}/hwmon/hwmonModel.h | 0 .../src}/hwmon/hwmonMsg.cpp | 0 .../src}/hwmon/hwmonParse.cpp | 0 .../src}/hwmon/hwmonSensor.cpp | 0 .../src}/hwmon/hwmonSensor.h | 0 .../src}/hwmon/hwmonThreads.cpp | 0 .../src}/hwmon/hwmonThreads.h | 0 .../src}/hwmon/hwmonUtil.cpp | 0 .../src}/hwmon/hwmonUtil.h | 0 .../src}/hwmon/scripts/hwmon.logrotate | 0 .../src}/hwmon/scripts/hwmon.service | 0 .../src}/hwmon/scripts/hwmond.conf | 0 .../src}/hwmon/scripts/hwmond_notify.py | 0 .../src}/hwmon/scripts/lsb/hwmon | 0 .../src}/hwmon/scripts/ocf/hwmon | 0 .../src}/hwmon/scripts/show_hp360 | 0 .../src}/hwmon/scripts/show_hp380 | 0 .../src}/hwmon/scripts/show_quanta | 0 .../src}/maintenance/Makefile | 27 +- .../src}/maintenance/ipmiClient.h | 0 .../src}/maintenance/mtcAlarm.cpp | 0 .../src}/maintenance/mtcAlarm.h | 0 .../src}/maintenance/mtcBrdMgmt.cpp | 0 .../src}/maintenance/mtcBrdMgmt.h | 0 .../src}/maintenance/mtcCmdHdlr.cpp | 0 .../src}/maintenance/mtcCompMsg.cpp | 0 .../src}/maintenance/mtcCtrlMsg.cpp | 0 .../src}/maintenance/mtcHttpSvr.cpp | 0 .../src}/maintenance/mtcHttpSvr.h | 0 .../src}/maintenance/mtcHttpUtil.cpp | 0 .../src}/maintenance/mtcHttpUtil.h | 0 .../src}/maintenance/mtcInvApi.cpp | 0 .../src}/maintenance/mtcInvApi.h | 0 .../src}/maintenance/mtcIpmiUtil.cpp | 0 .../src}/maintenance/mtcIpmiUtil.h | 0 .../src}/maintenance/mtcKeyApi.cpp | 0 .../src}/maintenance/mtcKeyApi.h | 0 .../src}/maintenance/mtcNodeComp.cpp | 0 .../src}/maintenance/mtcNodeComp.h | 0 .../src}/maintenance/mtcNodeCtrl.cpp | 0 .../src}/maintenance/mtcNodeFsm.cpp | 0 .../src}/maintenance/mtcNodeFsm.h | 0 .../src}/maintenance/mtcNodeHdlrs.cpp | 0 .../src}/maintenance/mtcNodeHdlrs.h | 0 .../src}/maintenance/mtcNodeMnfa.cpp | 0 .../src}/maintenance/mtcNodeMsg.h | 0 .../src}/maintenance/mtcSmgrApi.cpp | 0 .../src}/maintenance/mtcSmgrApi.h | 0 .../src}/maintenance/mtcSubfHdlrs.cpp | 0 .../src}/maintenance/mtcThreads.cpp | 0 .../src}/maintenance/mtcThreads.h | 0 .../src}/maintenance/mtcVimApi.cpp | 0 .../src}/maintenance/mtcVimApi.h | 0 .../src}/maintenance/mtcWorkQueue.cpp | 0 .../src}/mtclog/Makefile | 11 +- .../src}/mtclog/mtclog.cpp | 0 .../src}/pmon/Makefile | 11 +- .../src}/pmon/pmon.h | 0 .../src}/pmon/pmonAlarm.cpp | 0 .../src}/pmon/pmonAlarm.h | 0 .../src}/pmon/pmonFsm.cpp | 0 .../src}/pmon/pmonHdlr.cpp | 0 .../src}/pmon/pmonInit.cpp | 0 .../src}/pmon/pmonMsg.cpp | 0 .../src}/pmon/scripts/acpid.conf | 0 .../src}/pmon/scripts/nslcd.conf | 0 .../src}/pmon/scripts/pmon | 0 .../src}/pmon/scripts/pmon-restart | 0 .../src}/pmon/scripts/pmon-start | 0 .../src}/pmon/scripts/pmon-stop | 0 .../src}/pmon/scripts/pmon-test.sh | 0 .../src}/pmon/scripts/pmon.logrotate | 0 .../src}/pmon/scripts/pmon.service | 0 .../src}/pmon/scripts/pmond.conf | 0 .../src}/pmon/scripts/sshd.conf | 0 .../src}/pmon/scripts/syslog-ng.conf | 0 .../src}/public/Makefile | 10 +- .../src}/public/amon.c | 0 .../src}/public/amon.h | 0 .../src}/rmon/Makefile | 7 +- .../src}/rmon/interfaceHdlr.cpp | 0 .../src}/rmon/remoteloggingHdlr.cpp | 0 .../src}/rmon/rmon.h | 0 .../src}/rmon/rmonApi.h | 0 .../src}/rmon/rmonApi/Makefile | 10 +- .../src}/rmon/rmonApi/rmon_api.c | 0 .../src}/rmon/rmonApi/rmon_api.h | 0 .../src}/rmon/rmonApi/rmon_nodeMacro.h | 0 .../src}/rmon/rmonApi/tests/Makefile | 4 +- .../rmonApi/tests/rmon_api_client_test.cpp | 0 .../rmon/rmonApi/tests/rmon_api_client_test.h | 0 .../src}/rmon/rmonApi/tests/rmond_api_test | Bin .../src}/rmon/rmonFM.cpp | 0 .../src}/rmon/rmonHdlr.cpp | 0 .../src}/rmon/rmonHttp.cpp | 0 .../src}/rmon/rmonHttp.h | 0 .../src}/rmon/rmonInit.cpp | 0 .../src}/rmon/rmonMsg.cpp | 0 .../src}/rmon/rmon_resource_notify/Makefile | 7 +- .../rmon_resource_notify.cpp | 0 .../rmon_resource_notify.h | 0 .../rmon/scripts/cinder_virtual_resource.conf | 0 .../rmon/scripts/infrastructure_resource.conf | 0 .../src}/rmon/scripts/instance_resource.conf | 0 .../rmon/scripts/management_resource.conf | 0 .../rmon/scripts/nova_virtual_resource.conf | 0 .../src}/rmon/scripts/oam_resource.conf | 0 .../src}/rmon/scripts/query_ntp_servers.sh | 0 .../rmon/scripts/remotelogging_resource.conf | 0 .../src}/rmon/scripts/rmon | 0 .../src}/rmon/scripts/rmon.conf | 0 .../src}/rmon/scripts/rmon.logrotate | 0 .../src}/rmon/scripts/rmon.service | 0 .../src}/rmon/scripts/rmon_reload_on_cpe.sh | 0 .../src}/rmon/scripts/rmond.conf | 0 .../src}/rmon/scripts/virtual_resource.conf | 0 .../src}/rmon/thinmetaHdlr.cpp | 0 .../src}/scripts/config | 0 .../src}/scripts/config.service | 0 .../src}/scripts/dmemchk.sh | 0 .../src}/scripts/goenabled | 0 .../src}/scripts/goenabled.service | 0 .../src}/scripts/hbsAgent | 0 .../src}/scripts/hbsClient | 0 .../src}/scripts/hbsClient.conf | 0 .../src}/scripts/hbsClient.service | 0 .../src}/scripts/hwclock.service | 0 .../src}/scripts/hwclock.sh | 0 .../src}/scripts/mgmtlinkup | 0 .../src}/scripts/mtc.conf | 0 .../src}/scripts/mtc.ini | 0 .../src}/scripts/mtcAgent | 0 .../src}/scripts/mtcClient | 0 .../src}/scripts/mtcClient.conf | 0 .../src}/scripts/mtcClient.service | 0 .../src}/scripts/mtcTest | 0 .../src}/scripts/mtce.logrotate | 0 .../src}/scripts/mtcinit | 0 .../src}/scripts/mtclog | 0 .../src}/scripts/mtclog.service | 0 .../src}/scripts/mtclogd.conf | 0 .../src}/scripts/runservices | 0 .../src}/scripts/runservices.service | 0 .../src}/scripts/sched_trace | 0 .../scripts/sensor_hp360_v1_ilo_v4.profile | 0 .../scripts/sensor_hp380_v1_ilo_v4.profile | 0 .../scripts/sensor_integration_profile.README | 0 .../scripts/sensor_quanta_v1_ilo_v4.profile | 0 .../src}/scripts/store_trace | 0 .../src}/scripts/stress_ras.sh | 0 .../src}/scripts/stress_swact.sh | 0 .../src}/scripts/wipedisk | 0 321 files changed, 456 insertions(+), 11829 deletions(-) create mode 100644 mtce-common/centos/mtce-common.spec delete mode 100755 mtce-common/cgts-mtce-common-1.0/Makefile delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/Makefile delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/README.txt delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestAgent.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestBase.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestClass.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestClass.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestServer.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestStubs.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestSvrFsm.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestSvrHdlr.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestUtil.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestUtil.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.cpp delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.h delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guest.ini delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.logrotate delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.ocf delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.service delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgentTest.sh delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.logrotate delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.pmon delete mode 100644 mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.service rename mtce-common/{cgts-mtce-common-1.0 => src}/.gitignore (100%) rename mtce-common/{ => src}/LICENSE (100%) create mode 100755 mtce-common/src/Makefile rename mtce-common/{cgts-mtce-common-1.0 => src}/common/Makefile (87%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/alarmUtil.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/alarmUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/fitCodes.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/hostClass.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/hostClass.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/hostUtil.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/hostUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/httpUtil.cpp (99%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/httpUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/ipmiUtil.cpp (99%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/ipmiUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/jsonUtil.cpp (99%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/jsonUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/keyClass.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/keyClass.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/logMacros.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/msgClass.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/msgClass.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nlEvent.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nlEvent.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeBase.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeBase.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeEvent.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeEvent.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeMacro.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeTimers.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeTimers.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeUtil.cpp (99%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/nodeUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/pgdbClass.cpp.OBS (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/pgdbClass.h.OBS (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/pgdbUtil.cpp.OBS (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/pingUtil.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/pingUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/regexUtil.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/regexUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/returnCodes.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/threadUtil.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/threadUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/timeUtil.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/timeUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/tokenUtil.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/common/tokenUtil.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/Makefile (92%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_common.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_config.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_debug.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_files.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_ini.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_ini.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_main.cpp (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_option.h (100%) rename mtce-common/{cgts-mtce-common-1.0 => src}/daemon/daemon_signal.cpp (100%) create mode 100644 mtce/PKG-INFO create mode 100644 mtce/centos/build_srpm.data rename mtce-common/centos/cgts-mtce-common.spec => mtce/centos/mtce.spec (80%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/LICENSE (100%) create mode 100755 mtce/src/Makefile rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/Makefile (81%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/alarm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/alarm.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/alarmData.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/alarmHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/alarmInit.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/alarmMgr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/alarmUtil.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/scripts/mtcalarm.init (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/scripts/mtcalarm.logrotate (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/scripts/mtcalarm.pmon.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/alarm/scripts/mtcalarm.service (100%) create mode 100755 mtce/src/common/Makefile rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/common/nodeClass.cpp (99%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/common/nodeClass.h (99%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/common/nodeCmds.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/Makefile (83%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/fsmon.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/fsmonHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/fsmonInit.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/scripts/fsmon (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/scripts/fsmon.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/scripts/fsmon.logrotate (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/scripts/fsmon.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/fsmon/scripts/fsmond.conf (100%) create mode 100644 mtce/src/fsync/Makefile rename {mtce-common/cgts-mtce-common-1.0/common => mtce/src/fsync}/fsync.c (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/Makefile (53%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/hbsAgent.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/hbsAlarm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/hbsAlarm.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/hbsBase.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/hbsClient.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/hbsPmon.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/heartbeat/hbsStubs.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/Makefile (83%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/hostw.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/hostwHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/hostwInit.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/hostwMsg.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/hostwMsg.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/scripts/hostw (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/scripts/hostw.logrotate (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/scripts/hostw.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hostw/scripts/hostwd.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/Makefile (87%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hp380.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmon.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonAlarm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonAlarm.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonClass.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonClass.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonFsm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonGroup.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonGroup.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonHttp.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonHttp.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonHttpClient.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonInit.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonIpmi.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonIpmi.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonJson.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonJson.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonModel.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonModel.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonMsg.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonParse.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonSensor.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonSensor.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonThreads.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonThreads.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonUtil.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/hwmonUtil.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/hwmon.logrotate (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/hwmon.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/hwmond.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/hwmond_notify.py (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/lsb/hwmon (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/ocf/hwmon (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/show_hp360 (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/show_hp380 (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/hwmon/scripts/show_quanta (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/Makefile (70%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/ipmiClient.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcAlarm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcAlarm.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcBrdMgmt.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcBrdMgmt.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcCmdHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcCompMsg.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcCtrlMsg.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcHttpSvr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcHttpSvr.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcHttpUtil.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcHttpUtil.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcInvApi.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcInvApi.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcIpmiUtil.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcIpmiUtil.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcKeyApi.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcKeyApi.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeComp.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeComp.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeCtrl.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeFsm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeFsm.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeHdlrs.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeHdlrs.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeMnfa.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcNodeMsg.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcSmgrApi.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcSmgrApi.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcSubfHdlrs.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcThreads.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcThreads.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcVimApi.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcVimApi.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/maintenance/mtcWorkQueue.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/mtclog/Makefile (81%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/mtclog/mtclog.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/Makefile (82%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/pmon.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/pmonAlarm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/pmonAlarm.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/pmonFsm.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/pmonHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/pmonInit.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/pmonMsg.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/acpid.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/nslcd.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmon (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmon-restart (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmon-start (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmon-stop (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmon-test.sh (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmon.logrotate (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmon.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/pmond.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/sshd.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/pmon/scripts/syslog-ng.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/public/Makefile (89%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/public/amon.c (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/public/amon.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/Makefile (86%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/interfaceHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/remoteloggingHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmon.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/Makefile (89%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/rmon_api.c (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/rmon_api.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/rmon_nodeMacro.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/tests/Makefile (80%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/tests/rmon_api_client_test.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/tests/rmon_api_client_test.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonApi/tests/rmond_api_test (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonFM.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonHttp.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonHttp.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonInit.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmonMsg.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmon_resource_notify/Makefile (81%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmon_resource_notify/rmon_resource_notify.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/rmon_resource_notify/rmon_resource_notify.h (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/cinder_virtual_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/infrastructure_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/instance_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/management_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/nova_virtual_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/oam_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/query_ntp_servers.sh (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/remotelogging_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/rmon (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/rmon.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/rmon.logrotate (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/rmon.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/rmon_reload_on_cpe.sh (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/rmond.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/scripts/virtual_resource.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/rmon/thinmetaHdlr.cpp (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/config (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/config.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/dmemchk.sh (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/goenabled (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/goenabled.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/hbsAgent (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/hbsClient (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/hbsClient.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/hbsClient.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/hwclock.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/hwclock.sh (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mgmtlinkup (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtc.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtc.ini (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtcAgent (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtcClient (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtcClient.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtcClient.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtcTest (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtce.logrotate (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtcinit (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtclog (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtclog.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/mtclogd.conf (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/runservices (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/runservices.service (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/sched_trace (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/sensor_hp360_v1_ilo_v4.profile (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/sensor_hp380_v1_ilo_v4.profile (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/sensor_integration_profile.README (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/sensor_quanta_v1_ilo_v4.profile (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/store_trace (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/stress_ras.sh (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/stress_swact.sh (100%) rename {mtce-common/cgts-mtce-common-1.0 => mtce/src}/scripts/wipedisk (100%) diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 10042215..e554f74e 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -2,14 +2,12 @@ # If these have dependencies, they will be pulled in automatically # -# cgts-mtce-common -cgts-mtce-common -cgts-mtce-common-pmon -cgts-mtce-common-rmon -cgts-mtce-common-hwmon -cgts-mtce-common-guestAgent -cgts-mtce-common-guestServer -cgts-mtce-common-hostw +# mtce +mtce +mtce-pmon +mtce-rmon +mtce-hwmon +mtce-hostw # cgts-mtce-compute cgts-mtce-compute diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 861a2d68..46ade9ae 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1,4 +1,5 @@ mtce-common +mtce mtce-compute mtce-control mtce-storage diff --git a/mtce-common/PKG-INFO b/mtce-common/PKG-INFO index 42620cd1..9bf6bd75 100644 --- a/mtce-common/PKG-INFO +++ b/mtce-common/PKG-INFO @@ -1,5 +1,5 @@ Metadata-Version: 1.1 -Name: cgts-mtce-common +Name: mtce-common Version: 1.0 Summary: Titanium Cloud Platform Common Node Maintenance Package Home-page: @@ -7,10 +7,7 @@ Author: Windriver Author-email: info@windriver.com License: Apache-2.0 -Description: Maintenance common package containing host maintenace and heartbeat - agent/client daemons as well as the hardware and process monitor - daemons, hardware watchdog process, guest heartbeat agent/client - daemons, resource and file system daemons as well as initialization - and support files for each. +Description: Maintenance common package containing shared utility code between + mtce and mtce-guest. Platform: UNKNOWN diff --git a/mtce-common/centos/build_srpm.data b/mtce-common/centos/build_srpm.data index 43e3cd2c..f8556950 100644 --- a/mtce-common/centos/build_srpm.data +++ b/mtce-common/centos/build_srpm.data @@ -1,3 +1,3 @@ -SRC_DIR="cgts-mtce-common-1.0" -TIS_PATCH_VER=138 +SRC_DIR="src" +TIS_PATCH_VER=139 BUILD_IS_SLOW=5 diff --git a/mtce-common/centos/mtce-common.spec b/mtce-common/centos/mtce-common.spec new file mode 100644 index 00000000..738d82fa --- /dev/null +++ b/mtce-common/centos/mtce-common.spec @@ -0,0 +1,154 @@ +Summary: Titanuim Cloud Maintenance Common Base Package +Name: mtce-common +Version: 1.0 +Release: %{tis_patch_ver}%{?_tis_dist} +License: Apache-2.0 +Group: base +Packager: Wind River +URL: unknown +Source0: %{name}-%{version}.tar.gz +BuildRequires: libssh2 +BuildRequires: libssh2-devel +BuildRequires: json-c +BuildRequires: json-c-devel +BuildRequires: fm-common +BuildRequires: fm-common-dev +BuildRequires: openssl +BuildRequires: openssl-devel +BuildRequires: libevent +BuildRequires: libevent-devel +BuildRequires: fm-mgr +BuildRequires: expect +BuildRequires: postgresql +BuildRequires: libuuid-devel +BuildRequires: guest-client-devel +BuildRequires: systemd-devel +BuildRequires: cppcheck +Requires: util-linux +Requires: /bin/bash +Requires: /bin/systemctl +Requires: dpkg +Requires: time +Requires: libevent-2.0.so.5()(64bit) +Requires: expect +Requires: libfmcommon.so.1()(64bit) +Requires: libstdc++.so.6(GLIBCXX_3.4.14)(64bit) +Requires: libstdc++.so.6(GLIBCXX_3.4.9)(64bit) +Requires: fm-common >= 1.0 +Requires: libc.so.6(GLIBC_2.2.5)(64bit) +Requires: libstdc++.so.6(GLIBCXX_3.4.11)(64bit) +Requires: /bin/sh +Requires: librt.so.1()(64bit) +Requires: libc.so.6(GLIBC_2.3)(64bit) +Requires: libc.so.6(GLIBC_2.14)(64bit) +Requires: libjson-c.so.2()(64bit) +Requires: libpthread.so.0(GLIBC_2.2.5)(64bit) +Requires: librt.so.1(GLIBC_2.3.3)(64bit) +Requires: libgcc_s.so.1(GCC_3.0)(64bit) +Requires: libstdc++.so.6(CXXABI_1.3)(64bit) +Requires: libevent >= 2.0.21 +Requires: librt.so.1(GLIBC_2.2.5)(64bit) +Requires: libuuid.so.1()(64bit) +Requires: libm.so.6()(64bit) +Requires: rtld(GNU_HASH) +Requires: libstdc++.so.6()(64bit) +Requires: libc.so.6(GLIBC_2.4)(64bit) +Requires: libc.so.6()(64bit) +Requires: libssh2.so.1()(64bit) +Requires: libgcc_s.so.1()(64bit) +Requires: libstdc++.so.6(GLIBCXX_3.4)(64bit) +Requires: libstdc++.so.6(GLIBCXX_3.4.15)(64bit) +Requires: libpthread.so.0()(64bit) +Requires: /usr/bin/expect +Requires: python-rtslib + +%description +Summary: Titanuim Cloud Maintenance Common Base Package + +%package -n mtce-common-dev +Summary: Titanuim Cloud Maintenance Common Base - Development files +Group: devel +Provides: mtce-common-dev = %{version}-%{release} + +%description -n mtce-common-dev +Titanuim Cloud Maintenance Common Base. This package contains header files, +and related items necessary for software development. + +# Disable debuginfo for mtce-common. This package is not included in the +# target ISO, and does not contain binaries. This directive prevents the +# utility find-debugfiles.sh from failing if it cannot find debuginfo files. +%define debug_package %{nil} + +%prep +%setup + +%build +VER=%{version} +MAJOR=$(echo $VER | awk -F . '{print $1}') +MINOR=$(echo $VER | awk -F . '{print $2}') +make MAJOR=$MAJOR MINOR=$MINOR %{?_smp_mflags} build + +%global _buildsubdir %{_builddir}/%{name}-%{version} + +%install +rm -v -rf $RPM_BUILD_ROOT +VER=%{version} +MAJOR=$(echo $VER | awk -F . '{print $1}') +MINOR=$(echo $VER | awk -F . '{print $2}') + +install -m 755 -d %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/daemon/libdaemon.a %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/common/libcommon.a %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/common/libthreadUtil.a %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/common/libipmiUtil.a %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/common/libpingUtil.a %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/common/libnodeBase.a %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/common/libregexUtil.a %{buildroot}%{_libdir} +install -m 644 -p -D %{_buildsubdir}/common/libhostUtil.a %{buildroot}%{_libdir} + +# mtce-common headers required to bring in nodeBase.h +install -m 755 -d %{buildroot}%{_includedir} +install -m 755 -d %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/fitCodes.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/logMacros.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/returnCodes.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/nodeTimers.h %{buildroot}%{_includedir}/mtce-common + +# mtce-common headers required to build mtce-guest +install -m 644 -p -D %{_buildsubdir}/common/hostClass.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/httpUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/jsonUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/msgClass.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/nodeBase.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/nodeEvent.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/nodeMacro.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/nodeUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/timeUtil.h %{buildroot}%{_includedir}/mtce-common + +# mtce-daemon headers required to build mtce-guest +install -m 755 -d %{buildroot}%{_includedir}/mtce-daemon +install -m 644 -p -D %{_buildsubdir}/daemon/daemon_ini.h %{buildroot}%{_includedir}/mtce-daemon +install -m 644 -p -D %{_buildsubdir}/daemon/daemon_common.h %{buildroot}%{_includedir}/mtce-daemon +install -m 644 -p -D %{_buildsubdir}/daemon/daemon_option.h %{buildroot}%{_includedir}/mtce-daemon + +# remaining mtce-common headers required to build mtce +install -m 644 -p -D %{_buildsubdir}/common/alarmUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/hostUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/ipmiUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/nlEvent.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/pingUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/regexUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/threadUtil.h %{buildroot}%{_includedir}/mtce-common +install -m 644 -p -D %{_buildsubdir}/common/tokenUtil.h %{buildroot}%{_includedir}/mtce-common + +%clean +rm -v -rf $RPM_BUILD_ROOT + +%post + +%files -n mtce-common-dev +%defattr(-,root,root,-) +%{_includedir}/mtce-common/*.h +%{_includedir}/mtce-daemon/*.h +%{_libdir}/*.a + diff --git a/mtce-common/cgts-mtce-common-1.0/Makefile b/mtce-common/cgts-mtce-common-1.0/Makefile deleted file mode 100755 index f942d70c..00000000 --- a/mtce-common/cgts-mtce-common-1.0/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (c) 2013-2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -VER=1 -VER_MJR=1 - -build: - @(cd public ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd rmon/rmonApi ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd daemon ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd common ; make lib fsync VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd alarm ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd heartbeat ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd maintenance ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd hwmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd mtclog ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd pmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd guest ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd fsmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd rmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd rmon/rmon_resource_notify ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - @(cd hostw ; make build VER=$(VER) VER_MJR=$(VER_MJR)) - -clean: - @( cd public ; make clean ) - @( cd rmon/rmonApi ; make clean ) - @( cd daemon ; make clean ) - @( cd common ; make clean ) - @( cd alarm ; make clean ) - @( cd mtclog ; make clean ) - @( cd hwmon ; make clean ) - @( cd pmon ; make clean ) - @( cd guest ; make clean ) - @( cd fsmon ; make clean ) - @( cd heartbeat ; make clean ) - @( cd maintenance ; make clean ) - @( cd rmon ; make clean ) - @( cd rmon/rmon_resource_notify ; make clean ) - @( cd hostw ; make clean ) - @( rm -rf release ) - -backup: clean - mkdir -p ~/mtce - cp -a * ~/mtce diff --git a/mtce-common/cgts-mtce-common-1.0/guest/Makefile b/mtce-common/cgts-mtce-common-1.0/guest/Makefile deleted file mode 100644 index f4c5df17..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (c) 2015-2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -SRCS = guestClass.cpp guestInstClass.cpp \ - guestSvrFsm.cpp guestSvrHdlr.cpp \ - guestServer.cpp guestAgent.cpp \ - guestHttpSvr.cpp guestHttpUtil.cpp guestVimApi.cpp \ - guestUtil.cpp guestSvrUtil.cpp guestSvrMsg.cpp \ - guestVirtio.cpp guestStubs.cpp -AGENT_OBJS = \ - guestAgent.o guestClass.o guestHttpSvr.o guestHttpUtil.o guestVimApi.o guestUtil.o guestStubs.o -SERVER_OBJS = \ - guestServer.o guestInstClass.o \ - guestSvrFsm.o guestSvrHdlr.o \ - guestSvrMsg.o guestVirtio.o \ - guestUtil.o guestSvrUtil.o - -OBJS = $(SRCS:.cpp=.o) - -CCPFLAGS = -g -O2 -Wall -Wextra -Werror -LDLIBS = -lstdc++ -ldaemon -lcommon -lfmcommon -ljson-c -levent -lrt -lcrypto -luuid -INCLUDES = -I../daemon -I../common -I../maintenance -I. -I.. - -#CFLAGS = -fPIC -g -O2 -Wall -Wextra -Werror -I../daemon -I../common -I. -I.. - -#.cpp.o: -# $(CXX) $(INCLUDES) $(CCPFLAGS) $(EXTRACCFLAGS) -c $< -o $@ - -build: $(OBJS) - $(CXX) $(CCPFLAGS) $(AGENT_OBJS) -L../daemon -L../common -L../public -L.. $(LDLIBS) -o guestAgent - $(CXX) $(CCPFLAGS) $(SERVER_OBJS) -L../libs -L../daemon -L../common -L../public -L.. $(LDLIBS) -L. -o guestServer - -#$(CXX) $(CCPFLAGS) $(SERVER_OBJS) -L../libs -L../daemon -L../common -L../public -L.. $(LDLIBS) -L. -ltrap_handler -lalarm_clock -latomic -o guestServer - -.cpp.o: - $(CXX) $(INCLUDES) $(CCPFLAGS) $(EXTRACCFLAGS) -c $< -o $@ - -common: - ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) - -daemon: - ( cd ../daemon ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) - -clean: - @rm -f $(OBJ) guestAgent guestServer *.o *.a libghbb.so.1 diff --git a/mtce-common/cgts-mtce-common-1.0/guest/README.txt b/mtce-common/cgts-mtce-common-1.0/guest/README.txt deleted file mode 100644 index cb613a1a..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/README.txt +++ /dev/null @@ -1,84 +0,0 @@ -This maintenance common guest service was introduced in cgts release 2 in order to -provide a means of guest heartbeat orchistration under VIM (system management) control. - -This module includes header files exported to the sysroot by the original cgts -release 1 heartbeat service for messaging structure definition. - -That original module builds a common heartbeat daemon capable of running on the -controller, compute and within the vm. The controller version did nothing except -for respond to heartbeats from the compute version. The compute instance was the -brains of the heartbeat service reponsible for starting heartbeat to the VMs and -interfacing with Nova to take actions. - -The introduction of this module changes a large part of that. -Here is a summary of the changes - -1. Packaging and Initialization: - - The source code for the original cgts release 1 heartbeat daemon remains - unchanged but the packaging of the heartbeat daemon and heartbeat_init - script are modified - - a. image.inc and filter_out packaging files are modified to exclude the - heartbeat daemon from being packaged on the controller. - - b. because the heartbeat daemon is still packaged on the compute - heartbeat_init script is modified to prevent the heartbeat - daemon from being spawned on the compute host. - - Note: the heartbeat daemon continues to be packaged and spawned in the guest - as it did in release 1 - no change there. - -2. Compute Function: Heartbeats the guest and reports failures. - - Package: cgts-mtce-common-guestServer-1.0-r54.0.x86_64.rpm - Binary: /usr/local/bin/guestServer - Init: /etc/init.d/guestServer - Managed: /etc/pmon.d/guestServer.pmon - -3. Controller Function: Guest heartbeat control and event proxy - - Package: cgts-mtce-common-guestAgent-x.x-rxx.x86_64.rpm - Binary: /usr/local/bin/guestAgent - Init: /usr/lib/ocf/resource.d/platform/guestAgent - Managed: by SM - - The heartbeat daemon that did run on the controller is replaced by a new - guestAgent daemon performing the following functions - - a. HTTP Command Receiver : to which the VIM sends instance control commands. - b. HTTP Event Transmitter: to which the daemon can send instance failure - events and state query commands to the VIM. - c. State query audit to the - -Behavioral Executive Summary: - -The guestServer daemon (on the compute) listens for (using inotify) 'uuid' -UNIX named heartbeat communication channels that nova:libvirt creates and -opens in /var/lib/libvirt/qemu whenever an instance is created. Example: - -/var/lib/libvirt/qemu/cgcs.heartbeat.02e172a9-aeae-4cef-a6bc-7eb9de7825d6.sock - -The guestServer connects (and auto reconnects) to these channels when they are -created or modified and disconnects from them when deleted. - -Once connected, the guestServer listens for TCP messages over that UNIX named -socket. - -If a guest supports heartbeating then it will run the heartbeat_init script -during its initialization process. Once the heartbeat daemon is running it -will periodically send init request messages to the libvirt pipe that, -on the host side, the guestServer is listening for. - -on receipt of an init message, the guestServer will extract name, timeout -and corrective action info from it and then send back an 'init_ack' followed -by a continuous heartbeat cycle consisting of sending a 'challenge' request -messages and expecting a correct computational responses within a guest specified -heartbeat window. Failure to comply will result in a corrective action that was -specified in the init message from the guest. - -The VIM is responsible for enabling and disabling heartbeat fault reporting as -well as taking the guest specified corrective action in he event of a heartbeat -failure. - -The VIM guestAgent running diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestAgent.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestAgent.cpp deleted file mode 100644 index c2bb5647..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestAgent.cpp +++ /dev/null @@ -1,1429 +0,0 @@ -/* - * Copyright (c) 2013, 2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Services Agent Daemon - * - * Services: heartbeat - */ - -#include -#include -#include -#include -#include -#include -#include -#include /* for ... hostent */ -#include -#include -#include -#include -#include -#include /* for ... close and usleep */ -#include -#include /* for ... RTMGRP_LINK */ - -using namespace std; - -#include "daemon_ini.h" /* Ini Parser Header */ -#include "daemon_common.h" /* Common definitions and types for daemons */ -#include "daemon_option.h" /* Common options for daemons */ - -#include "nodeBase.h" -#include "nodeMacro.h" /* for ... CREATE_NONBLOCK_INET_UDP_RX_SOCKET */ -#include "nodeUtil.h" /* for ... get_ip_addresses */ -#include "nodeTimers.h" /* maintenance timer utilities start/stop */ -#include "jsonUtil.h" /* for ... jsonApi_get_key_value */ -#include "httpUtil.h" /* for ... */ - -#include "guestBase.h" /* Guest services Base Header File */ -#include "guestClass.h" /* */ -#include "guestUtil.h" /* for ... guestUtil_inst_init */ - -#include "guestHttpUtil.h" /* for ... guestHttpUtil_init */ -#include "guestHttpSvr.h" /* for ... guestHttpSvr_init/_fini/_look */ -#include "guestVimApi.h" /* for ... guestVimApi_getHostState */ - -/* Where to send events */ -string guestAgent_ip = "" ; - -/* Process Monitor Control Structure */ -static ctrl_type _ctrl ; - -/** This heartbeat service inventory is tracked by - * the same nodeLinkClass that maintenance uses. - * - */ -guestHostClass hostInv ; -guestHostClass * get_hostInv_ptr ( void ) -{ - return (&hostInv); -} - -/** Setup the pointer */ -int module_init ( void ) -{ - return (PASS); -} - -msgSock_type * get_mtclogd_sockPtr ( void ) -{ - return (&_ctrl.sock.mtclogd); -} - -void daemon_sigchld_hdlr ( void ) -{ - ; /* dlog("Received SIGCHLD ... no action\n"); */ -} - -/** - * Daemon Configuration Structure - The allocated struct - * @see daemon_common.h for daemon_config_type struct format. - */ -static daemon_config_type guest_config ; - -#ifdef __cplusplus -extern "C" { -#endif -daemon_config_type * daemon_get_cfg_ptr () { return &guest_config ; } -#ifdef __cplusplus -} -#endif - -/* Cleanup exit handler */ -void daemon_exit ( void ) -{ - daemon_dump_info (); - daemon_files_fini (); - - /* Close the event socket */ - if ( _ctrl.sock.server_rx_sock ) - delete (_ctrl.sock.server_rx_sock); - - if ( _ctrl.sock.server_tx_sock ) - delete (_ctrl.sock.server_tx_sock); - - if ( _ctrl.sock.agent_rx_local_sock ) - delete (_ctrl.sock.agent_rx_local_sock); - - if ( _ctrl.sock.agent_rx_float_sock ) - delete (_ctrl.sock.agent_rx_float_sock); - - if ( _ctrl.sock.agent_tx_sock ) - delete (_ctrl.sock.agent_tx_sock); - - guestHttpSvr_fini (); - guestHttpUtil_fini (); - - fflush (stdout); - fflush (stderr); - - exit (0); -} - -#define CONFIG_CHALLENGE_PERIOD (1) - -int _self_provision ( void ) -{ - int rc = PASS ; - int waiting_msg = false ; - - hostInv.hostBase.my_float_ip.clear(); - hostInv.hostBase.my_local_ip.clear(); - - for ( ;; ) - { - get_ip_addresses ( hostInv.hostBase.my_hostname, - hostInv.hostBase.my_local_ip , - hostInv.hostBase.my_float_ip ); - - if ( hostInv.hostBase.my_float_ip.empty() || hostInv.hostBase.my_local_ip.empty() ) - { - if ( waiting_msg == false ) - { - ilog ("Waiting on ip address config ...\n"); - waiting_msg = true ; - - /* Flush the init data */ - fflush (stdout); - fflush (stderr); - } - mtcWait_secs (3); - } - else - { - break ; - } - daemon_signal_hdlr (); - } - return (rc); -} - - -/** Control Config Mask */ -// #define CONFIG_MASK (CONFIG_CHALLENGE_PERIOD) -/** Client Config mask */ -#define CONFIG_MASK (CONFIG_CLIENT_RX_PORT |\ - CONFIG_AGENT_RX_PORT |\ - CONFIG_MTC_CMD_PORT |\ - CONFIG_VIM_CMD_RX_PORT |\ - CONFIG_VIM_EVENT_RX_PORT |\ - CONFIG_MTC_EVENT_PORT) - -/* Startup config read */ -static int _config_handler ( void * user, - const char * section, - const char * name, - const char * value) -{ - daemon_config_type* config_ptr = (daemon_config_type*)user; - - if (MATCH("agent", "rx_port")) - { - config_ptr->agent_rx_port = atoi(value); - config_ptr->mask |= CONFIG_AGENT_RX_PORT ; - } - else if (MATCH("agent", "vim_cmd_port")) - { - config_ptr->vim_cmd_port = atoi(value); - config_ptr->mask |= CONFIG_VIM_CMD_RX_PORT ; - } - else if (MATCH("client", "rx_port")) - { - config_ptr->client_rx_port = atoi(value); - config_ptr->mask |= CONFIG_CLIENT_RX_PORT ; - } - else - { - return (PASS); - } - return (FAIL); -} - -/* Startup config read */ -static int mtc_config_handler ( void * user, - const char * section, - const char * name, - const char * value) -{ - daemon_config_type* config_ptr = (daemon_config_type*)user; - - if (MATCH("agent", "hbs_to_mtc_event_port")) - { - config_ptr->hbs_to_mtc_event_port = atoi(value); - config_ptr->mask |= CONFIG_MTC_EVENT_PORT ; - } - if (MATCH("agent", "mtc_to_guest_cmd_port")) - { - config_ptr->mtc_to_guest_cmd_port = atoi(value); - config_ptr->mask |= CONFIG_MTC_CMD_PORT ; - } - else - { - return (PASS); - } - return (FAIL); -} - -int _nfvi_handler( void * user, - const char * section, - const char * name, - const char * value) -{ - daemon_config_type* config_ptr = (daemon_config_type*)user; - - if (MATCH("guest-rest-api", "port")) - { - config_ptr->vim_event_port = atoi(value); - config_ptr->mask |= CONFIG_VIM_EVENT_RX_PORT ; - } - else - { - return (PASS); - } - return (FAIL); -} - -/* Read the mtc.ini settings into the daemon configuration */ -int daemon_configure ( void ) -{ - /* Read the ini */ - char config_fn[100] ; - guest_config.mask = 0 ; - sprintf ( &config_fn[0], "/etc/mtc/%s.ini", program_invocation_short_name ); - if (ini_parse(config_fn, _config_handler, &guest_config) < 0) - { - elog("Can't load '%s'\n", config_fn ); - return (FAIL_LOAD_INI); - } - - get_debug_options ( config_fn, &guest_config ); - - if (ini_parse(MTCE_CONF_FILE, mtc_config_handler, &guest_config) < 0) - { - elog("Can't load '%s'\n", MTCE_CONF_FILE ); - return (FAIL_LOAD_INI); - } - - if (ini_parse(NFVI_PLUGIN_CFG_FILE, _nfvi_handler, &guest_config) < 0) - { - elog ("Can't load '%s'\n", NFVI_PLUGIN_CFG_FILE ); - return (FAIL_LOAD_INI); - } - - /* Verify loaded config against an expected mask - * as an ini file fault detection method */ - if ( guest_config.mask != CONFIG_MASK ) - { - elog ("Error: Agent configuration failed (%x) (%x:%x)\n", - ((-1 ^ guest_config.mask) & CONFIG_MASK), - guest_config.mask, CONFIG_MASK ); - return (FAIL_INI_CONFIG); - } - - guest_config.mgmnt_iface = daemon_get_iface_master ( guest_config.mgmnt_iface ); - ilog("Interface : %s\n", guest_config.mgmnt_iface ); - ilog("Command Port: %d (rx) from mtcAgent\n", guest_config.mtc_to_guest_cmd_port ); - ilog("Event Port: %d (tx) to mtcAgent\n", guest_config.hbs_to_mtc_event_port ); - ilog("Command Port: %d (tx) to guestServer\n", guest_config.client_rx_port); - ilog("Event Port: %d (rx) from guestServer\n",guest_config.agent_rx_port ); - ilog("Command Port: %d (rx) from vim\n",guest_config.vim_cmd_port ); - ilog("Event Port: %d (rx) to vim\n",guest_config.vim_event_port ); - - /* provision this controller */ - if ( _self_provision () != PASS ) - { - elog ("Failed to self provision active controller\n"); - daemon_exit (); - } - - return (PASS); -} - -void _timer_handler ( int sig, siginfo_t *si, void *uc) -{ - timer_t * tid_ptr = (void**)si->si_value.sival_ptr ; - - /* Avoid compiler errors/warnings for parms we must - * have but currently do nothing with */ - sig=sig ; uc = uc ; - - if ( !(*tid_ptr) ) - { - // tlog ("Called with a NULL Timer ID\n"); - return ; - } - /* is base ctrl mtc timer */ - else if (( *tid_ptr == _ctrl.timer.tid ) ) - { - mtcTimer_stop_int_safe ( _ctrl.timer ); - _ctrl.timer.ring = true ; - } - - /* is base object mtc timer */ - else if (( *tid_ptr == hostInv.audit_timer.tid ) ) - { - mtcTimer_stop_int_safe ( hostInv.audit_timer ); - hostInv.audit_timer.ring = true ; - } - else - { - mtcTimer_stop_tid_int_safe (tid_ptr); - } -} - -int mtclogd_port_init ( ctrl_type * ctrl_ptr ) -{ - int rc = PASS ; - int port = ctrl_ptr->sock.mtclogd.port = daemon_get_cfg_ptr()->daemon_log_port ; - CREATE_REUSABLE_INET_UDP_TX_SOCKET ( LOOPBACK_IP, - port, - ctrl_ptr->sock.mtclogd.sock, - ctrl_ptr->sock.mtclogd.addr, - ctrl_ptr->sock.mtclogd.port, - ctrl_ptr->sock.mtclogd.len, - "mtc logger message", - rc ); - if ( rc ) - { - elog ("Failed to setup messaging to mtclogd on port %d\n", port ); - } - return (rc); -} - -/****************************/ -/* Initialization Utilities */ -/****************************/ - -/* Construct the messaging sockets * - * 1. multicast transmit socket * - * 2. unicast receive socket */ -int _socket_init ( void ) -{ - int rc = PASS ; - - guestAgent_ip = getipbyname ( CONTROLLER ); - ilog ("ControllerIP: %s\n", guestAgent_ip.c_str()); - - /* Read the ports the socket struct */ - _ctrl.sock.agent_rx_port = guest_config.agent_rx_port ; - _ctrl.sock.server_rx_port = guest_config.client_rx_port ; - - /******************************************************************/ - /* UDP Tx Message Socket Towards guestServer */ - /******************************************************************/ - - _ctrl.sock.agent_tx_sock = new msgClassTx(guestAgent_ip.c_str(), guest_config.client_rx_port, IPPROTO_UDP, guest_config.mgmnt_iface); - rc = _ctrl.sock.agent_tx_sock->return_status; - if ( rc ) - { - elog ("Failed to setup 'guestAgent' transmitter\n" ); - return (rc) ; - } - - /******************************************************************/ - /* UDP Tx Message Socket Towards mtcAgent */ - /******************************************************************/ - - _ctrl.sock.mtc_event_tx_port = guest_config.hbs_to_mtc_event_port ; - _ctrl.sock.mtc_event_tx_sock = new msgClassTx(LOOPBACK_IP, guest_config.hbs_to_mtc_event_port, IPPROTO_UDP); - rc = _ctrl.sock.mtc_event_tx_sock->return_status; - if ( rc ) - { - elog ("Failed to setup 'mtcAgent' 'lo' transmitter on port (%d)\n", - _ctrl.sock.mtc_event_tx_port ); - - return (rc) ; - } - - /***************************************************************/ - /* Non-Blocking UDP Rx Message Socket for Maintenance Commands */ - /***************************************************************/ - - _ctrl.sock.mtc_cmd_port = guest_config.mtc_to_guest_cmd_port ; - _ctrl.sock.mtc_cmd_sock = new msgClassRx(LOOPBACK_IP, guest_config.mtc_to_guest_cmd_port, IPPROTO_UDP); - rc = _ctrl.sock.mtc_cmd_sock->return_status; - if ( rc ) - { - elog ("Failed to setup mtce command receive on port %d\n", - _ctrl.sock.mtc_cmd_port ); - return (rc) ; - } - - /* Get a socket that listens to the controller's FLOATING IP */ - /* This is the socket that the guestAgent receives events from - * the guestServer from the compute on */ - _ctrl.sock.agent_rx_float_sock = new msgClassRx(hostInv.hostBase.my_float_ip.c_str(), guest_config.agent_rx_port, IPPROTO_UDP); - rc = _ctrl.sock.agent_rx_float_sock->return_status; - if ( rc ) - { - elog ("Failed to setup 'guestServer' receiver on port %d\n", - _ctrl.sock.server_rx_port ); - return (rc) ; - } - - /* Get a socket that listens to the controller's LOCAL IP */ - /* This is the socket that the guestAgent receives events from - * the guestServer from the compute on */ - _ctrl.sock.agent_rx_local_sock = new msgClassRx(hostInv.hostBase.my_local_ip.c_str(), guest_config.agent_rx_port, IPPROTO_UDP); - rc = _ctrl.sock.agent_rx_local_sock->return_status; - if ( rc ) - { - elog ("Failed to setup 'guestServer' receiver on port %d\n", - _ctrl.sock.server_rx_port ); - return (rc) ; - } - - /* Don't fail the daemon if the logger port is not working */ - mtclogd_port_init (&_ctrl); - - rc = guestHttpSvr_init ( guest_config.vim_cmd_port ); - - return (rc) ; -} - -/* The main heartbeat service loop */ -int daemon_init ( string iface, string nodetype ) -{ - int rc = 10 ; - - /* Not used by this service */ - nodetype = nodetype ; - - /* Initialize socket construct and pointer to it */ - memset ( &_ctrl.sock, 0, sizeof(_ctrl.sock)); - - /* initialize the timer */ - mtcTimer_init ( _ctrl.timer ); - _ctrl.timer.hostname = "guestAgent" ; - - /* Assign interface to config */ - guest_config.mgmnt_iface = (char*)iface.data() ; - - httpUtil_init (); - - if ( daemon_files_init ( ) != PASS ) - { - elog ("Pid, log or other files could not be opened\n"); - rc = FAIL_FILES_INIT ; - } - - /* Bind signal handlers */ - else if ( daemon_signal_init () != PASS ) - { - elog ("daemon_signal_init failed\n"); - rc = FAIL_SIGNAL_INIT ; - } - - /* Configure the agent */ - else if ( (rc = daemon_configure ( )) != PASS ) - { - elog ("Daemon service configuration failed (rc:%i)\n", rc ); - rc = FAIL_DAEMON_CONFIG ; - } - - /* Setup the heartbeat service messaging sockets */ - else if ( (rc = _socket_init ( )) != PASS ) - { - elog ("socket initialization failed (rc:%d)\n", rc ); - rc = FAIL_SOCKET_INIT ; - } - else - { - _ctrl.timer.hostname = hostInv.hostBase.my_hostname ; - } - - return (rc); -} - - -/*************************************************************************** - * - * Name: send_cmd_to_guestServer - * - * Description: Messaging interface capable of building command specific - * messages and sending them to the guestServer daemon on - * the specified compute host. - * - * TODO: setup acknowledge mechanism using guestHost - * - ***************************************************************************/ -int send_cmd_to_guestServer ( string hostname, - unsigned int cmd, - string uuid, - bool reporting, - string event) -{ - mtc_message_type msg ; - int bytes_sent = 0 ; - int bytes_to_send = 0 ; - int rc = PASS ; - - string ip = hostInv.get_host_ip(hostname) ; - - - memset (&msg,0,sizeof(mtc_message_type)); - memcpy (&msg.hdr[0], get_guest_msg_hdr(), MSG_HEADER_SIZE ); - - /* Start creating the json string to he client */ - string payload = "{" ; - payload.append("\"source\":\""); - payload.append(hostInv.hostBase.my_float_ip); - payload.append("\""); - - if ( cmd == MTC_EVENT_LOOPBACK ) - { - ; /* go with default payload only */ - } - else if ( cmd == MTC_CMD_ADD_INST ) - { - ilog ("%s %s 'add' instance ; sent to guestServer\n", hostname.c_str(), uuid.c_str()); - payload.append(",\"uuid\":\""); - payload.append(uuid); - payload.append("\",\"service\":\"heartbeat\""); - payload.append(",\"state\":\""); - if ( reporting == true ) - payload.append("enabled\""); - else - payload.append("disabled\""); - } - else if ( cmd == MTC_CMD_DEL_INST ) - { - ilog ("%s %s 'delete' instance ; sent to guestServer\n", hostname.c_str(), uuid.c_str()); - payload.append(",\"uuid\":\""); - payload.append(uuid); - payload.append("\",\"service\":\"heartbeat\""); - payload.append(",\"state\":\"disabled\""); - } - else if ( cmd == MTC_CMD_MOD_INST ) - { - /* this may be a frequent log so its changed to a message log */ - mlog ("%s %s 'modify' instance ; sent to guestServer\n", hostname.c_str(), uuid.c_str()); - payload.append(",\"uuid\":\""); - payload.append(uuid); - payload.append("\",\"service\":\"heartbeat\""); - - payload.append(",\"state\":\""); - if ( reporting == true ) - payload.append("enabled\""); - else - payload.append("disabled\""); - } - else if ( cmd == MTC_CMD_MOD_HOST ) - { - payload.append(",\"uuid\":\""); - payload.append(uuid); - - /* In this host case , the instance heartbeat member - * contains the state we want to entire host to be - * put to */ - payload.append("\",\"heartbeat\":\""); - if ( reporting == true ) - payload.append("enabled\""); - else - payload.append("disabled\""); - - ilog ("%s %s 'modify' host (reporting=%s); sent to guestServer\n", - hostname.c_str(), - uuid.c_str(), - reporting ? "enabled" : "disabled" ); - } - else if ( cmd == MTC_CMD_QRY_INST ) - { - /* setting the query flag so the FSM - * knows to wait for the response. */ - hostInv.set_query_flag ( hostname ); - } - else if ( cmd == MTC_CMD_VOTE_INST - || cmd == MTC_CMD_NOTIFY_INST ) - { - bool vote ; - payload.append(",\"uuid\":\""); - payload.append(uuid); - payload.append("\",\"event\":\""); - payload.append(event); - payload.append("\""); - - if ( cmd == MTC_CMD_VOTE_INST ) - vote = true ; - else - vote = false ; - - ilog ("%s %s '%s' host (event=%s); sent to guestServer\n", - hostname.c_str(), - uuid.c_str(), - vote ? "vote" : "notify", - event.c_str()); - } - else - { - slog ("unsupported command (%d)\n", cmd ); - return (FAIL_BAD_CASE); - } - - payload.append("}"); - memcpy (&msg.buf[0], payload.data(), payload.length()); - msg.cmd = cmd ; - bytes_to_send = ((sizeof(mtc_message_type))-(BUF_SIZE))+(strlen(msg.buf)) ; - print_mtc_message ( &msg ); - bytes_sent = _ctrl.sock.agent_tx_sock->write((char *)&msg, bytes_to_send,ip.data(), _ctrl.sock.server_rx_port); - - if ( 0 > bytes_sent ) - { - elog("%s failed to send command (rc:%i)\n", hostname.c_str(), rc); - rc = FAIL_SOCKET_SENDTO ; - } - else if ( bytes_to_send != bytes_sent ) - { - wlog ("%s transmit byte count error (%d:%d)\n", - hostname.c_str(), bytes_to_send, bytes_sent ); - rc = FAIL_TO_TRANSMIT ; - } - else - { - mlog1 ("Transmit to %s port %5d\n", - _ctrl.sock.agent_tx_sock->get_dst_str(), - _ctrl.sock.agent_tx_sock->get_dst_addr()->getPort()); - rc = PASS ; - - /* Schedule receive ACK mechanism - bind a callback */ - } - - return (rc); -} - - -/*************************************************************************** - * - * Name: send_event_to_mtcAgent - * - * Description: Messaging interface capable of building the specified event - * messages and sending them to the mtcAgent daemon locally. - * - * TODO: setup acknowledge mechanism using guestHost - * - ***************************************************************************/ -int send_event_to_mtcAgent ( string hostname, - unsigned int event) -{ - int bytes_sent = 0 ; - int bytes_to_send = 0 ; - int rc = FAIL ; - - mtc_message_type msg ; - memset (&msg, 0 , sizeof(mtc_message_type)); - memcpy (&msg.hdr[0], get_guest_msg_hdr(), MSG_HEADER_SIZE ); - memcpy (&msg.hdr[MSG_HEADER_SIZE], "guestAgent", strlen("guestAgent")); - if ( event == MTC_EVENT_MONITOR_READY ) - { - if ( event == MTC_EVENT_MONITOR_READY ) - { - ilog ("%s requesting inventory from mtcAgent\n", hostname.c_str()); - } - msg.cmd = event ; - print_mtc_message (&msg ); - bytes_to_send = ((sizeof(mtc_message_type))-(BUF_SIZE))+(strlen(msg.buf)) ; - bytes_sent = _ctrl.sock.mtc_event_tx_sock->write((char*)&msg, bytes_to_send); - if ( 0 > bytes_sent ) - { - elog("%s Failed to send event (%d:%m)\n", hostname.c_str(), errno ); - rc = FAIL_SOCKET_SENDTO ; - } - else if ( bytes_to_send != bytes_sent ) - { - wlog ("%s transmit byte count error (%d:%d)\n", - hostname.c_str(), bytes_to_send, bytes_sent ); - rc = FAIL_TO_TRANSMIT ; - } - else - { - mlog1 ("Transmit to %s port %d\n", - _ctrl.sock.mtc_event_tx_sock->get_dst_str(), - _ctrl.sock.mtc_event_tx_sock->get_dst_addr()->getPort()); - rc = PASS ; - - /* Schedule receive ACK mechanism - bind a callback */ - } - } - else - { - slog ("Unsupported event (%d)\n", event ); - return ( FAIL_BAD_CASE ); - } - - return rc ; -} - -/*************************************************************************** - * - * Name: service_mtcAgent_command - * - * Description: Message handling interface capable of servicing mtcAgent - * commands such as 'add host', 'del host', 'mod host', etc. - * - * TODO: setup acknowledge mechanism using guestHost - * - ***************************************************************************/ -int service_mtcAgent_command ( unsigned int cmd , char * buf_ptr ) -{ - if ( !buf_ptr ) - { - slog ("Empty payload"); - return (FAIL); - } - string uuid = ""; - string hostname = ""; - string hosttype = ""; - string ip = ""; - - int rc = jsonUtil_get_key_val ( buf_ptr, "hostname", hostname ) ; - if ( rc != PASS ) - { - elog ("failed to get hostname\n"); - return (FAIL_GET_HOSTNAME); - } - rc = jsonUtil_get_key_val ( buf_ptr, "uuid", uuid ) ; - if ( rc != PASS ) - { - elog ("%s failed to get host 'uuid'\n", hostname.c_str()); - elog ("... buffer:%s\n", buf_ptr ); - - return (FAIL_INVALID_UUID); - } - - if ( cmd == MTC_CMD_ADD_HOST ) - { - rc = jsonUtil_get_key_val ( buf_ptr, "ip", ip ); - if ( rc == PASS ) - { - rc = jsonUtil_get_key_val ( buf_ptr, "personality", hosttype ); - if ( rc == PASS ) - { - rc = hostInv.add_host ( uuid, ip, hostname, hosttype ); - } - else - { - elog ("%s failed to get host 'personality'\n", hostname.c_str()); - } - } - else - { - elog ("%s failed to get host 'ip'\n", hostname.c_str()); - } - } - else if ( cmd == MTC_CMD_MOD_HOST ) - { - rc = jsonUtil_get_key_val ( buf_ptr, "ip", ip ); - if ( rc == PASS ) - { - rc = jsonUtil_get_key_val ( buf_ptr, "personality", hosttype ); - if ( rc == PASS ) - { - rc = hostInv.mod_host ( uuid, ip, hostname, hosttype ); - } - else - { - elog ("%s failed to get host 'personality'\n", hostname.c_str()); - } - } - else - { - elog ("%s failed to get host 'ip'\n", hostname.c_str()); - } - } - else if ( cmd == MTC_CMD_DEL_HOST ) - { - rc = hostInv.del_host ( uuid ); - } - else - { - wlog ("Unsupported command (%d)\n", cmd ); - rc = FAIL_BAD_CASE ; - } - return (rc); -} - - - -int recv_from_guestServer ( unsigned int cmd, char * buf_ptr ) -{ - int rc = PASS ; - switch ( cmd ) - { - case MTC_EVENT_MONITOR_READY: - { - string hostname = "" ; - if ( jsonUtil_get_key_val ( buf_ptr, "hostname", hostname ) ) - { - elog ("failed to extract 'hostname' from 'ready event'\n" ); - rc = FAIL_LOCATE_KEY_VALUE ; - } - else - { - ilog ("%s guestServer ready event\n", hostname.c_str()); - - /* Set all the instance state for this host */ - get_hostInv_ptr()->set_inst_state ( hostname ); - } - break ; - } - case MTC_EVENT_HEARTBEAT_RUNNING: - case MTC_EVENT_HEARTBEAT_STOPPED: - case MTC_EVENT_HEARTBEAT_ILLHEALTH: - { - string hostname = "" ; - string uuid = "" ; - int rc1 = jsonUtil_get_key_val ( buf_ptr, "hostname", hostname ); - int rc2 = jsonUtil_get_key_val ( buf_ptr, "uuid", uuid ); - if ( rc1 | rc2 ) - { - elog ("failed to parse 'hostname' or 'uuid' from heartbeat event buffer (%d:%d)\n", - rc1, rc2 ); - elog ("... Buffer: %s\n", buf_ptr ); - return ( FAIL_KEY_VALUE_PARSE ); - } - instInfo * instInfo_ptr = get_hostInv_ptr()->get_inst ( uuid ); - rc1 = guestUtil_get_inst_info ( hostname , instInfo_ptr, buf_ptr ); - if ( rc1 == PASS ) - { - if ( instInfo_ptr ) - { - string state ; - - if ( instInfo_ptr->heartbeat.reporting == true ) - state = "enabled" ; - else - state = "disabled" ; - - if ( cmd == MTC_EVENT_HEARTBEAT_ILLHEALTH ) - { - ilog ("%s %s ill health notification\n", hostname.c_str(), instInfo_ptr->uuid.c_str()); - rc = guestVimApi_alarm_event ( hostname, uuid ); - } - else if ( cmd == MTC_EVENT_HEARTBEAT_RUNNING ) - { - if ( instInfo_ptr->heartbeating != true ) - { - instInfo_ptr->heartbeating = true ; - ilog ("%s %s is now heartbeating\n", hostname.c_str(), instInfo_ptr->uuid.c_str()); - } - string status = "enabled"; - rc = guestVimApi_svc_event ( hostname, uuid, state, status, instInfo_ptr->restart_to_str); - } - else - { - if ( instInfo_ptr->heartbeating != false ) - { - instInfo_ptr->heartbeating = false ; - wlog ("%s %s is not heartbeating\n", hostname.c_str(), instInfo_ptr->uuid.c_str()); - } - string status = "disabled"; - rc = guestVimApi_svc_event ( hostname, uuid, state, status, "0"); - } - if ( rc != PASS ) - { - elog ("%s %s failed to send state change 'event' to vim (rc:%d)\n", - hostname.c_str(), instInfo_ptr->uuid.c_str(), rc ); - } - } - else - { - elog ("%s %s failed instance lookup\n", hostname.c_str(), uuid.c_str()); - } - } - else - { - elog ("failed to get instance info\n"); - } - break ; - } - - case MTC_EVENT_HEARTBEAT_LOSS: - { - string hostname = "" ; - string uuid = "" ; - int rc1 = jsonUtil_get_key_val ( buf_ptr, "hostname", hostname ) ; - int rc2 = jsonUtil_get_key_val ( buf_ptr, "uuid", uuid ) ; - if ( rc1 | rc2 ) - { - elog ("failed to parse 'heartbeat loss' key values (%d:%d)\n", rc1, rc2 ); - rc = FAIL_LOCATE_KEY_VALUE ; - } - else - { - if ( get_hostInv_ptr()->get_reporting_state ( hostname ) == true ) - { - instInfo * instInfo_ptr = get_hostInv_ptr()->get_inst ( uuid ) ; - if ( instInfo_ptr ) - { - if ( instInfo_ptr->heartbeat.reporting == true ) - { - rc = guestVimApi_inst_failed ( hostname, uuid , MTC_EVENT_HEARTBEAT_LOSS, 0 ); - } - else - { - ilog ("%s %s reporting disabled\n", hostname.c_str(), uuid.c_str() ); - } - } - else - { - elog ("%s %s failed instance lookup\n", hostname.c_str(), uuid.c_str() ); - rc = FAIL_HOSTNAME_LOOKUP ; - } - } - else - { - wlog ("%s heartbeat failure reporting disabled\n", hostname.c_str()); - } - } - break ; - } - case MTC_CMD_QRY_INST: - { - string hostname = "" ; - string uuid = "" ; - string status = "" ; - - jlog ("%s Instance Query Response: %s\n", hostname.c_str(), buf_ptr); - - int rc1 = jsonUtil_get_key_val ( buf_ptr, "hostname", hostname ) ; - int rc2 = jsonUtil_get_key_val ( buf_ptr, "uuid" , uuid ) ; - if ( rc1 | rc2 ) - { - ilog ("failed to parse 'hostname' or 'uuid' (%d:%d)\n", rc1, rc2 ); - } - - instInfo * instInfo_ptr = get_hostInv_ptr()->get_inst ( uuid ) ; - if ( instInfo_ptr ) - { - /** - * Verify that this instance is still associated with this host. - * This check was added as a fix and seeing - * a number of stale instance inventory in the guestServer. - * - * Without this check a late query response from an instance - * that was just deleted can result in an MOD sent to the - * server causing this instance to be mistakenly - * re-added to its inventory. - **/ - if ( !hostname.compare(instInfo_ptr->hostname) ) - { - /* - * Save the current reporting and heartbeating state - * only to compare to see if either has changed - */ - bool current_heartbeating_status = instInfo_ptr->heartbeating ; - bool current_reporting_state = instInfo_ptr->heartbeat.reporting ; - - if ( guestUtil_get_inst_info ( hostname, instInfo_ptr, buf_ptr ) == PASS ) - { - if ( instInfo_ptr->heartbeat.reporting != current_reporting_state ) - { - wlog ("%s:%s state mismatch\n", hostname.c_str(), uuid.c_str()); - wlog ("... state is '%s' but should be '%s' ... fixing\n", - instInfo_ptr->heartbeat.reporting ? "enabled" : "disabled", - current_reporting_state ? "enabled" : "disabled" ); - - instInfo_ptr->heartbeat.reporting = current_reporting_state ; - - rc = send_cmd_to_guestServer ( hostname, - MTC_CMD_MOD_INST , - uuid, - current_reporting_state ); - } - - if ( instInfo_ptr->heartbeating != current_heartbeating_status ) - { - string state ; - if ( instInfo_ptr->heartbeat.reporting == true ) - state = "enabled" ; - else - state = "disabled" ; - - if ( instInfo_ptr->heartbeating == true ) - { - string status = "enabled" ; - ilog ("%s %s is now heartbeating\n", hostname.c_str(), uuid.c_str()); - rc = guestVimApi_svc_event ( hostname, uuid, state, status, instInfo_ptr->restart_to_str); - } - else - { - string status = "disabled" ; - wlog ("%s %s is not heartbeating\n", hostname.c_str(), uuid.c_str()); - rc = guestVimApi_svc_event ( hostname, uuid, state, status, "0" ); - } - if ( rc != PASS ) - { - /* TODO: make this an elog before delivery */ - elog ("%s %s failed to send state change 'query' to vim (rc:%d)\n", hostname.c_str(), uuid.c_str(), rc ); - } - } - } - } - else - { - wlog ("%s %s no longer paired ; dropping query response\n", - hostname.c_str(), instInfo_ptr->uuid.c_str() ); - - /* Delete this just in case */ - send_cmd_to_guestServer ( hostname, MTC_CMD_DEL_INST , uuid, false ); - } - } - else - { - elog ("%s unknown uuid ; correcting ...\n", uuid.c_str() ); - - /* Delete this unknown host as it might somehow be stale */ - rc = send_cmd_to_guestServer ( hostname, MTC_CMD_DEL_INST , uuid, false ); - - rc = FAIL_UNKNOWN_HOSTNAME ; - } - hostInv.clr_query_flag ( hostname ); - break ; - } - case MTC_EVENT_VOTE_NOTIFY: - { - string hostname = "" ; - string instance_uuid = "" ; - string notification_type = ""; - string event = ""; - string vote = ""; - string reason = ""; - - int rc1 = jsonUtil_get_key_val ( buf_ptr, "hostname", hostname ) ; - int rc2 = jsonUtil_get_key_val ( buf_ptr, "uuid", instance_uuid ) ; - int rc3 = jsonUtil_get_key_val ( buf_ptr, "notification_type", notification_type ) ; - int rc4 = jsonUtil_get_key_val ( buf_ptr, "event-type", event ) ; - int rc5 = jsonUtil_get_key_val ( buf_ptr, "vote", vote ) ; - if ( rc1 | rc2 | rc3 | rc4 | rc5 ) - { - elog ("failed to parse 'vote-notify' key values (%d:%d:%d:%d:%d)\n", rc1, rc2, rc3, rc4, rc5); - rc = FAIL_LOCATE_KEY_VALUE ; - } - else - { - // 'reason' is optional - jsonUtil_get_key_val ( buf_ptr, "reason", reason ) ; - - jlog ("%s Instance Vote/Notification Response: %s\n", instance_uuid.c_str(), buf_ptr); - - string guest_response = ""; - - if (!vote.compare("accept") || !vote.compare("complete")) - { - if (!notification_type.compare("revocable")) - { - guest_response = "allow"; - } - else if (!notification_type.compare("irrevocable")) - { - guest_response = "proceed"; - } - else - { - rc = FAIL_BAD_PARM; - break; - } - } - else if (!vote.compare("reject")) - { - guest_response = "reject"; - } - else - { - rc = FAIL_BAD_PARM; - } - guestVimApi_inst_action (hostname, instance_uuid, event, guest_response, reason); - } - break ; - } - default: - elog ("Unsupported comand (%d)\n", cmd ); - } - return (rc); -} - - -void guestHostClass::run_fsm ( string hostname ) -{ - guestHostClass::guest_host * guest_host_ptr ; - guest_host_ptr = guestHostClass::getHost ( hostname ); - if ( guest_host_ptr != NULL ) - { - /* This FSM is only run on computes */ - if (( guest_host_ptr->hosttype & COMPUTE_TYPE ) == COMPUTE_TYPE) - { - flog ("%s FSM\n", hostname.c_str() ); - } - } -} - -/* Top level call to run FSM */ -/* TODO: Deal with delete */ -int guest_fsm_run ( guestHostClass * obj_ptr ) -{ - instInfo instance ; - - /* Run Maintenance on Inventory */ - for ( obj_ptr->hostlist_iter_ptr = obj_ptr->hostlist.begin () ; - obj_ptr->hostlist_iter_ptr != obj_ptr->hostlist.end () ; - obj_ptr->hostlist_iter_ptr++ ) - { - string hostname = *obj_ptr->hostlist_iter_ptr ; - - daemon_signal_hdlr (); - - obj_ptr->run_fsm ( hostname ); - - /* Run the audit on each host */ - if ( obj_ptr->audit_timer.ring == true ) - { - // ilog ("%s FSM Audit !\n", hostname.c_str() ); - - obj_ptr->audit_run = true ; - - if ( obj_ptr->get_got_host_state ( hostname ) == false ) - { - libEvent & event = hostInv.get_host_event ( hostname ); - string uuid = obj_ptr->get_host_uuid (hostname) ; - int rc = guestVimApi_getHostState ( hostname, uuid, event ); - - if ( rc != PASS ) - { - wlog ("%s failed to get host level reporting state (rc=%d)\n", - hostname.c_str(), rc); - } - else - { - /* Only set it if true as it is defaulted to false already. - * The VIM will send an enable command at a later time */ - if ( !event.value.compare("enabled")) - { - ilog ("%s fault reporting enabled\n", hostname.c_str()); - - rc = hostInv.set_reporting_state ( hostname, true ); - if ( rc != PASS ) - { - wlog ("%s failed to set host level reporting state (rc=%d)\n", - hostname.c_str(), rc); - } - } - else - { - rc = hostInv.set_reporting_state ( hostname, false ); - } - - dlog ("%s Got host state\n", hostname.c_str() ); - obj_ptr->set_got_host_state ( hostname ); - } - } - - /* make sure that the instances for this host are loaded */ - if ( obj_ptr->get_got_instances ( hostname ) == false ) - { - libEvent & event = hostInv.get_host_event ( hostname ); - string uuid = obj_ptr->get_host_uuid (hostname) ; - int rc = guestVimApi_getHostInst ( hostname, uuid, event ); - if ( rc != PASS ) - { - wlog ("%s failed to get host instances (rc=%d)\n", hostname.c_str(), rc); - } - else - { - obj_ptr->set_got_instances ( hostname ); - dlog ("%s instances loaded\n", hostname.c_str() ); - } - } - - /* only query the guestServer if reporting for that server - * is 'enabled' and instance list is not empty */ - if (( obj_ptr->num_instances ( hostname ) != 0 ) && - ( obj_ptr->get_reporting_state ( hostname ) == true )) - { - if ( obj_ptr->get_query_flag ( hostname ) == true ) - { - obj_ptr->inc_query_misses ( hostname); - dlog ("%s guestServer Query Misses:%d\n", hostname.c_str(), - obj_ptr->get_query_misses ( hostname )); - } - else - { - obj_ptr->clr_query_misses ( hostname ); - } - - /* Note: The 3rd and 4th parms are not needed - * for the MTC_CMD_QRY_INST command */ - send_cmd_to_guestServer ( hostname, MTC_CMD_QRY_INST, "", false ); - } - } - if ( obj_ptr->exit_fsm == true ) - { - obj_ptr->exit_fsm = false ; - break ; - } - } - if (( obj_ptr->audit_timer.ring == true ) && ( obj_ptr->audit_run == true )) - { - // dlog ("Audit Restarted\n"); - obj_ptr->audit_run = false ; - obj_ptr->audit_timer.ring = false ; - mtcTimer_start ( obj_ptr->audit_timer , _timer_handler, 10 ); - } - - return ( PASS ); -} - -/*****************************************************************************/ -/*****************************************************************************/ -/*****************************************************************************/ - -void daemon_service_run ( void ) -{ - int rc = PASS ; - int count = 0 ; - int flush_thld = 0 ; - - mtcTimer_start ( hostInv.audit_timer , _timer_handler, 2 ); - - guestHttpUtil_init (); - - /* socket descriptor list */ - std::list socks ; - - /* Not monitoring address changes RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR */ - if (( _ctrl.sock.ioctl_sock = open_ioctl_socket ( )) <= 0 ) - { - elog ("Failed to create ioctl socket"); - daemon_exit (); - } - - socks.clear(); - socks.push_front (_ctrl.sock.agent_rx_local_sock->getFD()); - socks.push_front (_ctrl.sock.agent_rx_float_sock->getFD()); - socks.push_front (_ctrl.sock.mtc_cmd_sock->getFD()); - dlog ("Selects: %d %d %d\n", _ctrl.sock.agent_rx_local_sock->getFD(), - _ctrl.sock.agent_rx_float_sock->getFD(), - _ctrl.sock.mtc_cmd_sock->getFD()); - socks.sort(); - - ilog ("Sending ready event to maintenance\n"); - do - { - /* Wait for maintenance */ - rc = send_event_to_mtcAgent ( hostInv.hostBase.my_hostname, - MTC_EVENT_MONITOR_READY ) ; - if ( rc == RETRY ) - { - mtcWait_secs ( 3 ); - } - } while ( rc == RETRY ) ; - - if ( rc == FAIL ) - { - elog ("Unrecoverable heartbeat startup error (rc=%d)\n", rc ); - daemon_exit (); - } - - /* enable the base level signal handler latency monitor */ - daemon_latency_monitor (true); - - ilog ("------------------------------------------------------------\n"); - - for ( ;; ) - { - /* Service Sockets */ - hostInv.waitd.tv_sec = 0; - hostInv.waitd.tv_usec = GUEST_SOCKET_TO ; - - /* Initialize the master fd_set */ - FD_ZERO(&hostInv.message_readfds); - - FD_SET(_ctrl.sock.agent_rx_local_sock->getFD(), &hostInv.message_readfds); - FD_SET(_ctrl.sock.agent_rx_float_sock->getFD(), &hostInv.message_readfds); - FD_SET(_ctrl.sock.mtc_cmd_sock->getFD(), &hostInv.message_readfds); - - /* Call select() and wait only up to SOCKET_WAIT */ - rc = select( socks.back()+1, &hostInv.message_readfds, NULL, NULL, &hostInv.waitd); - if (( rc < 0 ) || ( rc == 0 ) || ( rc > (int)socks.size())) - { - /* Check to see if the select call failed. */ - /* ... but filter Interrupt signal */ - if (( rc < 0 ) && ( errno != EINTR )) - { - wlog_throttled ( count, 20, "socket select failed (%d:%m)\n", errno); - } - else if ( rc > (int)socks.size()) - { - wlog_throttled ( count, 100, "Select return exceeds current file descriptors (%ld:%d)\n", - socks.size(), rc ); - } - else - { - count = 0 ; - } - } - else - { - mtc_message_type msg ; - memset ((void*)&msg,0,sizeof(mtc_message_type)); - - /* Service guestServer messages towards the local IP */ - if (FD_ISSET(_ctrl.sock.agent_rx_local_sock->getFD(), &hostInv.message_readfds) ) - { - int bytes = _ctrl.sock.agent_rx_local_sock->read((char*)&msg.hdr[0], sizeof(mtc_message_type)); - - mlog1 ("Received %d bytes from %s:%d:guestServer (local)\n", bytes, - _ctrl.sock.agent_rx_local_sock->get_src_str(), - _ctrl.sock.agent_rx_local_sock->get_dst_addr()->getPort()); - - recv_from_guestServer ( msg.cmd, msg.buf ); - print_mtc_message ( &msg ); - } - - /* Service guestServer messages towards the floating IP */ - else if (FD_ISSET(_ctrl.sock.agent_rx_float_sock->getFD(), &hostInv.message_readfds) ) - { - int bytes = _ctrl.sock.agent_rx_float_sock->read((char*)&msg.hdr[0], sizeof(mtc_message_type)); - - mlog1 ("Received %d bytes from %s:%d:guestServer (float)\n", bytes, - _ctrl.sock.agent_rx_float_sock->get_src_str(), - _ctrl.sock.agent_rx_port); - - recv_from_guestServer ( msg.cmd, msg.buf ); - print_mtc_message ( &msg ); - } - - /* Service mtcAgent commands */ - else if (FD_ISSET(_ctrl.sock.mtc_cmd_sock->getFD(), &hostInv.message_readfds) ) - { - int bytes = _ctrl.sock.mtc_cmd_sock->read((char*)&msg.hdr[0],sizeof(mtc_message_type)); - - mlog1 ("Received %d bytes from %s:%d:mtcAgent\n", bytes, - _ctrl.sock.mtc_cmd_sock->get_src_str(), - _ctrl.sock.mtc_cmd_port); - print_mtc_message ( &msg ); - if ( !strncmp ( get_cmd_req_msg_header(), &msg.hdr[0], MSG_HEADER_SIZE )) - { - service_mtcAgent_command ( msg.cmd , &msg.buf[0] ); - count = 0 ; - } - else - { - wlog_throttled ( count, 100, "Invalid message header\n"); - } - } - else - { - ilog ("Unknown select\n"); - } - } - - guestHttpSvr_look (); - - guest_fsm_run ( &hostInv ) ; - - daemon_signal_hdlr (); - - /* Support the log flush config option */ - if ( guest_config.flush ) - { - if ( ++flush_thld > guest_config.flush_thld ) - { - flush_thld = 0 ; - fflush (stdout); - fflush (stderr); - } - } - } - daemon_exit (); -} - -/* Push daemon state to log file */ -void daemon_dump_info ( void ) -{ - daemon_dump_membuf_banner (); - - hostInv.print_node_info (); - hostInv.memDumpAllState (); - - daemon_dump_membuf(); -} - -const char MY_DATA [100] = { "eieio\n" } ; -const char * daemon_stream_info ( void ) -{ - return (&MY_DATA[0]); -} - -/** Teat Head Entry */ -int daemon_run_testhead ( void ) -{ - int rc = PASS; - return (rc); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestBase.h b/mtce-common/cgts-mtce-common-1.0/guest/guestBase.h deleted file mode 100644 index 2381ccdb..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestBase.h +++ /dev/null @@ -1,319 +0,0 @@ -#ifndef __INCLUDE_GUESTBASE_H__ -#define __INCLUDE_GUESTBASE_H__ - -/* - * Copyright (c) 2013-2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Services "Base" Header - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -using namespace std; - -#include "msgClass.h" -#include "nodeBase.h" -#include "httpUtil.h" -#include "nodeTimers.h" - -#define WANT_NEW - -/** - * @addtogroup guest_services_base - * @{ - */ - -#ifdef __AREA__ -#undef __AREA__ -#endif -#define __AREA__ "gst" - -#define CONFIG_CLIENT_RX_PORT (0x00000001) -#define CONFIG_MTC_EVENT_PORT (0x00000002) -#define CONFIG_MTC_CMD_PORT (0x00000004) -#define CONFIG_AGENT_RX_PORT (0x00000008) -#define CONFIG_VIM_CMD_RX_PORT (0x00000010) -#define CONFIG_VIM_EVENT_RX_PORT (0x00000020) - -#define HB_DEFAULT_FIRST_MS 2000 -#define HB_DEFAULT_INTERVAL_MS 1000 -#define HB_DEFAULT_REBOOT_MS 10000 -#define HB_DEFAULT_VOTE_MS 10000 -#define HB_DEFAULT_SHUTDOWN_MS 10000 -#define HB_DEFAULT_SUSPEND_MS 10000 -#define HB_DEFAULT_RESUME_MS 10000 -#define HB_DEFAULT_RESTART_MS 120000 - -/* Directory where libvirt creates the serial I/O pipe channel sockets into the guest - * We monitor this directory with inotify for file changes */ -#define QEMU_CHANNEL_DIR ((const char *)"/var/lib/libvirt/qemu") - -#define ARRAY_SIZE(x) ((int)(sizeof(x)/sizeof(*x))) - -#define MAX_INSTANCES (100) -#define MAX_MESSAGES (10) - -/* The socket select timeout */ -#define GUEST_SOCKET_TO (10000) - -#define DEFAULT_CONNECT_WAIT (1) - -#define CONNECT_TIMOUT (60) -#define WAIT_FOR_INIT_TIMEOUT (60) -#define HEARTBEAT_START_TIMEOUT (120) -#define SEARCH_AUDIT_TIME (180) - -void guestTimer_handler ( int sig, siginfo_t *si, void *uc); - -const char * get_guest_msg_hdr (void) ; - -typedef struct -{ - char buffer [256]; -} gst_message_type ; - -typedef enum -{ - hbs_invalid, - hbs_server_waiting_init, - hbs_server_waiting_challenge, - hbs_server_waiting_response, - hbs_server_paused, // heartbeat paused at request of vm - hbs_server_nova_paused, // heartbeat paused at request of nova - hbs_server_migrating, // heartbeat paused while migrate in progress - hbs_server_corrective_action, - hbs_client_waiting_init_ack, - hbs_client_waiting_challenge, - hbs_client_waiting_pause_ack, - hbs_client_waiting_resume_ack, - hbs_client_paused, - hbs_client_waiting_shutdown_ack, - hbs_client_waiting_shutdown_response, - hbs_client_shutdown_response_recieved, - hbs_client_exiting, - hbs_state_max -} hb_state_t; - -/** Guest service control messaging socket control structure */ -typedef struct -{ - /** Guest Services Messaging Agent Receive (from guestServer) Socket - * - * Note: This socket supports receiving from the computes specifying - * either the floating or local IP */ - int agent_rx_port ; - msgClassSock* agent_rx_float_sock ; - msgClassSock* agent_rx_local_sock ; - - /** Guest Services Messaging Agent Transmit (to guestServer) Socket - * - * Note: This transmit socket can be used for any port - * specified at send time */ - msgClassSock* agent_tx_sock ; - - - /** Guest Services Messaging Socket mtcAgent commands are received on */ - msgClassSock* mtc_cmd_sock ; - int mtc_cmd_port ; - - /** Guest Services Messaging Server Receive (from guestAgent) Socket */ - msgClassSock* server_rx_sock ; - int server_rx_port ; - - /** Guest Services Messaging Server Transmit (to guestAgent) Socket */ - msgClassSock* server_tx_sock ; - struct sockaddr_in server_tx_addr ; - - /** Socket used to transmit READY status and Events to Maintenance */ - int mtc_event_tx_port ; - msgClassSock* mtc_event_tx_sock ; - - int netlink_sock ; /* netlink socket */ - int ioctl_sock ; /* general ioctl socket */ - - msgSock_type mtclogd ; -} guest_services_socket_type ; - -/** - * The HTTP server supports two URL levels ; - * a hosts level and instances level. - **/ -typedef enum -{ - SERVICE_LEVEL_NONE, - SERVICE_LEVEL_HOST, - SERVICE_LEVEL_INST, -} service_level_enum ; - -/** common service_type control info */ -typedef struct -{ - bool provisioned ; /* set true once the VIM issues create */ - string state ; /* enabled, configured or disabled */ - bool reporting ; /* failue reporting state */ - - int failures ; /* Running count of failures */ - bool failed ; /* true means heartbeating has failed */ - bool waiting ; /* Waiting on a response */ - int b2b_misses ; /* running back-to-back misses */ -} service_type ; - -/** A grouping of info extracted from command's url */ -typedef struct -{ - service_level_enum service_level ; - string uuid ; - string command ; - string temp ; -} url_info_type ; - -/** instance control structure */ -typedef struct -{ - string hostname ; /**< The host that this instance is on */ - - /* Instance identifiers */ - string name ; /**< the Instance Name as it appears in the GUI */ - string uuid ; /**< the instance uuid which is unique to the system */ - string chan ; /**< virtio channel name 'cgcs.heartbeat..sock' */ - string inst ; /**< the instance part of the channel name */ - - /* Set to true when this channel has been provisioned by the guestAgent */ - // bool provisioned ; - - /* - * Full path and name to the detected channel. - * Used to set inotify file watch. - */ - string fd_namespace ; - - #define CHAN_FLAGS (SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC ) - int chan_fd ; - bool chan_ok ; - - bool connecting ; - bool connected ; /* true = the channel is connected to the guest */ - bool heartbeating ; /* true = the heartbeating has started */ - - string name_log_prefix ; - string uuid_log_prefix ; - - int connect_wait_in_secs ; - - /* added service bools */ - service_type heartbeat ; - service_type reserved ; - - /* - * File and watch descriptors used to monitor - * specific files in QEMU_CHANNEL_DIR - */ - int inotify_file_fd ; - int inotify_file_wd ; - - /* Message header info */ - int version; - int revision; - string msg_type; - uint32_t sequence; - - hb_state_t hbState ; /* see heartbeat_types.h */ - hb_state_t vnState ; /* see heartbeat_types.h */ - - uint32_t invocation_id ; - - // For voting and notification - string event_type; // GuestHeartbeatMsgEventT - string notification_type; // GuestHeartbeatMsgNotifyT - - uint32_t heartbeat_challenge ; - uint32_t heartbeat_interval_ms ; - - uint32_t vote_secs; - uint32_t shutdown_notice_secs; - uint32_t suspend_notice_secs; - uint32_t resume_notice_secs; - uint32_t restart_secs; - string corrective_action; - - string unhealthy_corrective_action; - bool unhealthy_failure ; - - /* String versions of the above timeouts - integer portions only */ - string vote_to_str ; /* vote timeout in seconds as a string value */ - string shutdown_to_str ; /* shutdown timeout in seconds as a string value */ - string suspend_to_str ; /* suspend timeout in seconds as a string value */ - string resume_to_str ; /* resume timeout in seconds as a string value */ - string restart_to_str ; /* restart timeout in seconds as a string value */ - - int select_count ; - int message_count ; - int health_count ; - int failure_count ; - int connect_count ; - int connect_retry_count ; - int corrective_action_count ; - - libEvent vimEvent ; - -} instInfo ; - -/* daemon control structure - used for both guestAgent and guestServer */ -typedef struct -{ - bool init ; - char hostname [MAX_HOST_NAME_SIZE+1]; - string address ; - string address_peer ; /* used for server only */ - int nodetype ; /* used for server only */ - - guest_services_socket_type sock ; - struct mtc_timer timer ; - - /* List of instances provisioned on this host */ - list instance_list ; /* used for server only */ - list::iterator instance_list_ptr; /* used for server only */ - - /* file and watch descriptors used to monitor QEMU_CHANNEL_DIR */ - int inotify_dir_fd ; - int inotify_dir_wd ; - - - -} ctrl_type ; - -ctrl_type * get_ctrl_ptr ( void ); - - - -int send_cmd_to_guestServer ( string hostname, unsigned int cmd, string uuid, bool reporting, string event="unknown" ); - -/** - * @} guest_services_base - */ - -#endif /* __INCLUDE_GUESTBASE_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestClass.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestClass.cpp deleted file mode 100644 index 69cf64f7..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestClass.cpp +++ /dev/null @@ -1,1335 +0,0 @@ -/* - * Copyright (c) 2013-2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Services "Base" Header - */ - -#include "nodeBase.h" -#include "nodeTimers.h" -#include "guestClass.h" -#include "nodeUtil.h" - - -const char guest_msg_hdr [MSG_HEADER_SIZE] = {"guest msg header:"}; -const char * get_guest_msg_hdr (void) { return guest_msg_hdr ; } - -/* used as a default return in procedures that return a reference to libEvent */ -libEvent nullEvent ; - -/**< constructor */ -guestHostClass::guestHostClass() -{ - guest_head = guest_tail = NULL; - memory_allocs = 0 ; - memory_used = 0 ; - hosts = 0 ; - - for ( int i = 0 ; i < MAX_HOSTS ; i++ ) - { - host_ptrs[i] = NULL ; - } - /* Query Host state from the VIM bools */ - audit_run = false ; - - exit_fsm = false ; - -// httpUtil_event_init ( &nullEvent, "null", "null" , "0.0.0.0", 0 ); - nullEvent.request = SERVICE_NONE ; - return ; -} - -/**< destructor */ -guestHostClass::~guestHostClass() -{ - guest_host * ptr = guest_head ; - guest_host * temp_ptr = ptr ; - while ( ptr != NULL ) - { - temp_ptr = ptr ; - ptr = ptr->next ; - delHost (temp_ptr); - } - if ( memory_used != 0 ) - { - elog ( "Apparent Memory Leak - Allocs:%d and Bytes:%d\n", - memory_allocs, memory_used ); - } - else - { - dlog ( "No Memory Leaks\n\n"); - } - return ; -} - -/* - * Allocate new host and tack it on the end of the host_list - */ -struct guestHostClass::guest_host* guestHostClass::addHost( string hostname ) -{ - /* verify host is not already provisioned */ - struct guest_host * ptr = guestHostClass::getHost ( hostname ); - if ( ptr ) - { - if ( guestHostClass::remHost ( hostname ) ) - { - /* Should never get here but if we do then */ - /* something is seriously wrong */ - elog ("Error: Unable to remove host during reprovision\n"); - return static_cast(NULL); - } - } - - /* allocate memory for new host */ - ptr = guestHostClass::newHost (); - if( ptr == NULL ) - { - elog ( "Error: Failed to allocate memory for new host\n" ); - return static_cast(NULL); - } - - /* Init the new host */ - ptr->hostname = hostname ; - ptr->reporting = false ; - ptr->query_flag = false ; - - ptr->got_host_state = false; - ptr->got_instances = false; - - ptr->stage = STAGE__START ; - ptr->instance_list.clear(); - - /* Init host's general mtc timer */ - mtcTimer_init ( ptr->host_audit_timer ); - - /* Assign the timer the host's name */ - ptr->host_audit_timer.hostname = hostname ; - - /* If the host list is empty add it to the head */ - if( guest_head == NULL ) - { - guest_head = ptr ; - guest_tail = ptr ; - ptr->prev = NULL ; - ptr->next = NULL ; - } - else - { - /* link the new_host to the tail of the host_list - * then mark the next field as the end of the host_list - * adjust tail to point to the last host - */ - guest_tail->next = ptr ; - ptr->prev = guest_tail ; - ptr->next = NULL ; - guest_tail = ptr ; - } - - hosts++ ; - dlog2 ("Added guestHostClass host instance %d\n", hosts); - return ptr ; -} - -/* Remove a hist from the linked list of hosts - may require splice action */ -int guestHostClass::remHost( string hostname ) -{ - if ( hostname.c_str() == NULL ) - return -ENODEV ; - - if ( guest_head == NULL ) - return -ENXIO ; - - struct guest_host * ptr = guestHostClass::getHost ( hostname ); - - if ( ptr == NULL ) - return -EFAULT ; - - /* Free the mtc timer if in use */ - if ( ptr->host_audit_timer.tid ) - { - tlog ("%s Stopping host timer\n", hostname.c_str()); - mtcTimer_stop ( ptr->host_audit_timer ); - ptr->host_audit_timer.ring = false ; - ptr->host_audit_timer.tid = NULL ; - } - - /* If the host is the head host */ - if ( ptr == guest_head ) - { - /* only one host in the list case */ - if ( guest_head == guest_tail ) - { - dlog ("Single Host -> Head Case\n"); - guest_head = NULL ; - guest_tail = NULL ; - } - else - { - dlog ("Multiple Hosts -> Head Case\n"); - guest_head = guest_head->next ; - guest_head->prev = NULL ; - } - } - /* if not head but tail then there must be more than one - * host in the list so go ahead and chop the tail. - */ - else if ( ptr == guest_tail ) - { - dlog ("Multiple Host -> Tail Case\n"); - guest_tail = guest_tail->prev ; - guest_tail->next = NULL ; - } - else - { - dlog ("Multiple Host -> Full Splice Out\n"); - ptr->prev->next = ptr->next ; - ptr->next->prev = ptr->prev ; - } - guestHostClass::delHost ( ptr ); - hosts-- ; - return (PASS) ; -} - - -struct guestHostClass::guest_host* guestHostClass::getHost ( string hostname_or_uuid ) -{ - for ( struct guest_host * ptr = guest_head ; guest_head ; ptr = ptr->next ) - { - if ( !hostname_or_uuid.compare ( ptr->hostname )) - { - return ptr ; - } - else if ( !hostname_or_uuid.compare ( ptr->uuid )) - { - return ptr ; - } - - if (( ptr->next == NULL ) || ( ptr == guest_tail )) - break ; - } - return static_cast(NULL); -} - -/* - * Allocates memory for a new host and stores its the address in host_ptrs - * - * @param void - * @return pointer to the newly allocted host memory - */ -struct guestHostClass::guest_host * guestHostClass::newHost ( void ) -{ - struct guestHostClass::guest_host * temp_host_ptr = NULL ; - - if ( memory_allocs == 0 ) - { - memset ( host_ptrs, 0 , sizeof(struct guest_host *)*MAX_HOSTS); - } - - // find an empty spot - for ( int i = 0 ; i < MAX_HOSTS ; i++ ) - { - if ( host_ptrs[i] == NULL ) - { - host_ptrs[i] = temp_host_ptr = new guest_host ; - memory_allocs++ ; - memory_used += sizeof (struct guestHostClass::guest_host); - - return temp_host_ptr ; - } - } - elog ( "Failed to save new host pointer address\n" ); - return temp_host_ptr ; -} - -/* Frees the memory of a pre-allocated host and removes - * it from the host_ptrs list - * @param host * pointer to the host memory address to be freed - * @return int return code { PASS or -EINVAL } - */ -int guestHostClass::delHost ( struct guestHostClass::guest_host * host_ptr ) -{ - if ( guestHostClass::memory_allocs > 0 ) - { - for ( int i = 0 ; i < MAX_NODES ; i++ ) - { - if ( guestHostClass::host_ptrs[i] == host_ptr ) - { - delete host_ptr ; - guestHostClass::host_ptrs[i] = NULL ; - guestHostClass::memory_allocs-- ; - guestHostClass::memory_used -= sizeof (struct guestHostClass::guest_host); - return PASS ; - } - } - elog ( "Error: Unable to validate memory address being freed\n" ); - } - else - elog ( "Error: Free memory called when there is no memory to free\n" ); - - return -EINVAL ; -} - - -int guestHostClass::mod_host ( string uuid, string address, string hostname, string hosttype ) -{ - struct guestHostClass::guest_host * host_ptr = static_cast(NULL); - - if (hostname.empty()) - { - wlog ("Refusing to modify host with 'null' or 'invalid' hostname (uuid:%s)\n", - uuid.c_str()); - return (FAIL_INVALID_HOSTNAME) ; - } - - host_ptr = guestHostClass::getHost(hostname); - if ( !host_ptr ) - { - ilog ("%s not already provisioned\n", host_ptr->hostname.c_str()); - - /* Send back a retry in case the add needs to be converted to a modify */ - return (FAIL_INVALID_OPERATION); - } - host_ptr->uuid = uuid ; - host_ptr->ip = address ; - host_ptr->hosttype = get_host_function_mask (hosttype) ; - - ilog ("%s modify %s %s %s\n", - hostname.c_str(), - host_ptr->uuid.c_str(), - host_ptr->ip.c_str(), - hosttype.c_str()); - - return (PASS); -} - -int guestHostClass::add_host ( string uuid, - string address, - string hostname, - string hosttype) -{ - int rc = FAIL ; - struct guestHostClass::guest_host * host_ptr = static_cast(NULL); - - host_ptr = guestHostClass::getHost(hostname); - if ( host_ptr ) - { - ilog ("%s Already provisioned\n", host_ptr->hostname.c_str()); - - /* Send back a retry in case the add needs to be converted to a modify */ - return (RETRY); - } - /* Otherwise add it as a new host */ - else - { - host_ptr = guestHostClass::addHost(hostname); - if ( host_ptr ) - { - host_ptr->uuid = uuid ; - host_ptr->ip = address ; - host_ptr->hosttype = get_host_function_mask(hosttype); - - mtcTimer_init ( host_ptr->host_audit_timer, hostname ); - - host_ptr->stage = STAGE__START ; - - /* Add to the end of inventory */ - hostlist.push_back ( host_ptr->hostname ); - - rc = PASS ; - ilog ("%s added\n", hostname.c_str()); - } - else - { - elog ("%s add failed\n", hostname.c_str()); - rc = FAIL_NULL_POINTER ; - } - } - return (rc); -} - -/***************************************************************************** - * - * Name : rem_host - * - * Purpose : Remove this host from daemon all together - * - *****************************************************************************/ -int guestHostClass::rem_host ( string hostname ) -{ - int rc = FAIL ; - if ( ! hostname.empty() ) - { - /* remove the service specific component */ - hostlist.remove ( hostname ); - - exit_fsm = true ; - - /* free memory */ - rc = guestHostClass::remHost ( hostname ); - } - return ( rc ); -} - -/***************************************************************************** - * - * Name : del_host_inst - * - * Purpose : Delete all instances for this host - * - *****************************************************************************/ -int guestHostClass::del_host_inst ( string host_uuid ) -{ - int rc = FAIL_DEL_UNKNOWN ; - guestHostClass::guest_host * guest_host_ptr = guestHostClass::getHost( host_uuid ); - if ( guest_host_ptr ) - { - if ( guest_host_ptr->instance_list.size() != 0 ) - { - for ( guest_host_ptr->instance_list_ptr = guest_host_ptr->instance_list.begin(); - guest_host_ptr->instance_list_ptr != guest_host_ptr->instance_list.end(); - guest_host_ptr->instance_list_ptr++ ) - { - send_cmd_to_guestServer ( guest_host_ptr->hostname, - MTC_CMD_DEL_INST, - guest_host_ptr->instance_list_ptr->uuid, - guest_host_ptr->instance_list_ptr->heartbeat.reporting ); - } - - /* If the instance list is empty then clear the query flag */ - if ( guest_host_ptr->instance_list.empty () ) - { - clr_query_flag ( guest_host_ptr->hostname ); - } - } - } - else - { - wlog ("Unknown host uuid: %s\n", host_uuid.c_str()); - } - return (rc); -} - -/***************************************************************************** - * - * Name : del_inst - * - * Purpose : Add an instance to Delete all instances and then the host - * - *****************************************************************************/ -int guestHostClass::del_host ( string uuid ) -{ - int rc = FAIL_DEL_UNKNOWN ; - guestHostClass::guest_host * guest_host_ptr = guestHostClass::getHost( uuid ); - if ( guest_host_ptr ) - { - if ( guest_host_ptr->instance_list.size() != 0 ) - { - for ( guest_host_ptr->instance_list_ptr = guest_host_ptr->instance_list.begin(); - guest_host_ptr->instance_list_ptr != guest_host_ptr->instance_list.end(); - guest_host_ptr->instance_list_ptr++ ) - { - send_cmd_to_guestServer ( guest_host_ptr->hostname, - MTC_CMD_DEL_INST, - guest_host_ptr->instance_list_ptr->uuid, - guest_host_ptr->instance_list_ptr->heartbeat.reporting ); - } - } - /* save the hostname so that the logs below refer to something valid */ - string hostname = guest_host_ptr->hostname ; - rc = rem_host ( hostname ); - if ( rc == PASS ) - { - ilog ("%s deleted\n", hostname.c_str()); - print_node_info(); - } - else - { - elog ("%s delete host failed (rc:%d)\n", hostname.c_str(), rc ); - } - } - else - { - wlog ("Unknown uuid: %s\n", uuid.c_str()); - } - return (rc); -} - -/***************************************************************************** - * - * Name : add_inst - * - * Purpose : Add an instance to the guestAgent guestHostClass database - * - * Assumptions: This acts as a modify as well. See description below. - * - * Description: Search through all guestAgent guestHostClass database Looking - * for the specified instance uuid. - * - * If found against the specified hostname then just ensure the - * channel info is correct or updated, the services are disabled - * and the counters are reset. - * - * If found against a different host the do the same - * initialization but add a unique log staing this condition. - * - * If not found then just go ahead and add it to the instance - * list for the specified host with the same default initialization. - * - * Send a add command to the guestServer so that it has the - * opportunity to try to open the channel to the guest and - * start heartbeating. - * - *****************************************************************************/ - -int guestHostClass::add_inst ( string hostname, instInfo & instance ) -{ - int rc = FAIL_NOT_FOUND ; - - if ( instance.uuid.empty() ) - { - elog ("%s refusing to add null instance to host\n", hostname.c_str()); - return (FAIL_INVALID_UUID); - } - - /** - * Loop over all hosts looking for this instance. If it exhists for a different host - * then remove it from that host and add it to the specified host. - * This is done because the add is also acting as a modify operation - **/ - for ( struct guest_host * ptr = guest_head ; guest_head ; ptr = ptr->next ) - { - if ( ptr->instance_list.size() != 0 ) - { - for ( ptr->instance_list_ptr = ptr->instance_list.begin(); - ptr->instance_list_ptr != ptr->instance_list.end(); - ptr->instance_list_ptr++ ) - { - if ( !ptr->instance_list_ptr->uuid.compare(instance.uuid)) - { - /* Verify that this instance is for the specified host. - * If not then delete this instance from this host and - * allow it to be added below for the specified host */ - if ( ptr->hostname.compare(hostname) ) - { - /* not this host so delete it from the list */ - ilog ("%s %s move to %s\n", ptr->hostname.c_str(), - ptr->instance_list_ptr->uuid.c_str(), - hostname.c_str() ); - - /* remove the instance from this host's guestServer */ - send_cmd_to_guestServer ( ptr->hostname, - MTC_CMD_DEL_INST, - instance.uuid, - instance.heartbeat.reporting ); - - /* remove it from this hosts list */ - ptr->instance_list.erase(ptr->instance_list_ptr); - } - else - { - rc = PASS ; - - /* TODO: OBSOLETE check - * Update the instance if it is different from what was passed in */ - if ( ptr->instance_list_ptr->uuid.compare(instance.uuid) ) - { - ptr->instance_list_ptr->hostname = hostname ; - ptr->instance_list_ptr->uuid = instance.uuid ; - ptr->instance_list_ptr->heartbeat.reporting = instance.heartbeat.reporting ; - ptr->instance_list_ptr->heartbeat.provisioned = instance.heartbeat.provisioned; - ptr->instance_list_ptr->heartbeat.failures = 0 ; - ptr->instance_list_ptr->heartbeat.b2b_misses = 0 ; - - ptr->instance_list_ptr->restart_to_str = "0" ; - ptr->instance_list_ptr->resume_to_str = "0" ; - ptr->instance_list_ptr->suspend_to_str = "0" ; - ptr->instance_list_ptr->shutdown_to_str = "0" ; - ptr->instance_list_ptr->vote_to_str = "0" ; - - ilog ("%s %s updated info\n", hostname.c_str(), instance.uuid.c_str()); - - /* Setup the new channel */ - send_cmd_to_guestServer ( hostname, - MTC_CMD_ADD_INST, - instance.uuid, - instance.heartbeat.reporting ); - } - else - { - ilog ("%s %s info unchanged\n", - hostname.c_str(), instance.uuid.c_str()); - } - } - break ; - } - } - } - if (( ptr->next == NULL ) || ( ptr == guest_tail )) - break ; - } - - /* If the instance is not found then we need to add it to the specified host */ - if ( rc == FAIL_NOT_FOUND ) - { - struct guestHostClass::guest_host * host_ptr = static_cast(NULL); - host_ptr = guestHostClass::getHost(hostname); - if ( host_ptr ) - { - instance.hostname = hostname ; - - instance.restart_to_str = "0" ; - instance.resume_to_str = "0" ; - instance.suspend_to_str = "0" ; - instance.shutdown_to_str = "0" ; - instance.vote_to_str = "0" ; - - instance.heartbeat.provisioned = true ; - instance.heartbeat.failures = 0 ; - instance.heartbeat.b2b_misses = 0 ; - host_ptr->instance_list.push_back (instance); - - ilog ("%s %s add - Prov: %s Notify: %s\n", - hostname.c_str(), - instance.uuid.c_str(), - instance.heartbeat.provisioned ? "YES" : "no ", - instance.heartbeat.reporting ? "YES" : "no " ); - - send_cmd_to_guestServer ( hostname, MTC_CMD_ADD_INST, instance.uuid, instance.heartbeat.reporting ); - rc = PASS ; - } - else - { - elog ("%s hostname is unknown (%s)\n", hostname.c_str(), instance.uuid.c_str() ); - rc = FAIL_INVALID_HOSTNAME ; - } - } - return (rc); -} - -/***************************************************************************** - * - * Name : mod_inst - * - * Purpose : Modify an instance's services' state(s) - * - *****************************************************************************/ - -int guestHostClass::mod_inst ( string hostname, instInfo & instance ) -{ - int rc = FAIL_NOT_FOUND ; - - if ( instance.uuid.empty() ) - { - elog ("%s empty instance uuid\n", hostname.c_str()); - return (FAIL_INVALID_UUID); - } - - /** - * First search for this instance. - * If it is found against a different instance then we need to delete the - * instance from that host and add it to he new host. - **/ - for ( struct guest_host * ptr = guest_head ; guest_head ; ptr = ptr->next ) - { - if ( ptr->instance_list.size() != 0 ) - { - for ( ptr->instance_list_ptr = ptr->instance_list.begin(); - ptr->instance_list_ptr != ptr->instance_list.end(); - ptr->instance_list_ptr++ ) - { - if ( !ptr->instance_list_ptr->uuid.compare(instance.uuid)) - { - /* Verify that this instance is for the specified host. - * If not then delete this instance from this host and - * allow it to be added below for the specified host */ - if ( !ptr->hostname.compare(hostname) ) - { - /* This instance is provisioned for this host */ - - /* Manage its state */ - if ( ptr->instance_list_ptr->heartbeat.reporting != instance.heartbeat.reporting ) - { - ptr->instance_list_ptr->heartbeat.reporting = - instance.heartbeat.reporting ; - - ilog ("%s %s instance reporting state changed to %s\n", - ptr->hostname.c_str(), ptr->instance_list_ptr->uuid.c_str(), - ptr->instance_list_ptr->heartbeat.reporting ? "Enabled" : "Disabled"); - } - else - { - ilog ("%s %s instance reporting state already %s\n", - ptr->hostname.c_str(), ptr->instance_list_ptr->uuid.c_str(), - ptr->instance_list_ptr->heartbeat.reporting ? "Enabled" : "Disabled"); - } - send_cmd_to_guestServer ( ptr->hostname, - MTC_CMD_MOD_INST, - ptr->instance_list_ptr->uuid, - ptr->instance_list_ptr->heartbeat.reporting ); - return (PASS) ; - } - else - { - ilog ("%s %s move to %s while %s\n", - ptr->hostname.c_str(), - ptr->instance_list_ptr->uuid.c_str(), - hostname.c_str(), - ptr->instance_list_ptr->heartbeat.reporting ? "enabled" : "disabled"); - /** - * The instance must have moved to another host. - * Delete it here and then explicitely add - * it below by keeping rc = FAIL_NOT_FOUND - **/ - send_cmd_to_guestServer ( ptr->hostname, - MTC_CMD_DEL_INST, - instance.uuid, - instance.heartbeat.reporting ); - - ptr->instance_list.erase(ptr->instance_list_ptr); - - /* Go through other hosts just to make it easy to exit - * - acts as a safety net */ - break ; - } - } - } - } - if (( ptr->next == NULL ) || ( ptr == guest_tail )) - break ; - } - - /* If the instance is not found then we need to add it to the specified host */ - if ( rc == FAIL_NOT_FOUND ) - { - struct guestHostClass::guest_host * ptr = guestHostClass::getHost(hostname); - if ( ptr ) - { - instance.hostname = hostname ; - - instance.heartbeat.provisioned = true ; - - /* Don't change the reportinfg state */ - instance.heartbeat.reporting = instance.heartbeat.reporting ; - - instance.heartbeat.failures = 0 ; - instance.heartbeat.b2b_misses = 0 ; - - instance.restart_to_str = "0" ; - instance.resume_to_str = "0" ; - instance.suspend_to_str = "0" ; - instance.shutdown_to_str = "0" ; - instance.vote_to_str = "0" ; - - /* The mod might be straight to enabled state */ - ilog ("%s %s instance reporting state is %s\n", - ptr->hostname.c_str(), - instance.uuid.c_str(), - instance.heartbeat.reporting ? "Enabled" : "Disabled"); - - ptr->instance_list.push_back (instance); - send_cmd_to_guestServer ( hostname, - MTC_CMD_ADD_INST, - instance.uuid, - instance.heartbeat.reporting ); - rc = PASS ; - } - else - { - rc = FAIL_INVALID_HOSTNAME ; - } - } - return (rc); -} - - -/***************************************************************************** - * - * Name : del_inst - * - * Purpose : Delete an instance from the guestAgent guestHostClass database - * - * Description: Search all the hosts for this instance and remove it - * from its instance tracking list. - * - * Also send a delete command to the guestServer so that it - * has the opportunity to do any cleanup actions. - * - *****************************************************************************/ -int guestHostClass::del_inst ( string instance_uuid ) -{ - int rc = FAIL_NOT_FOUND ; - - if ( instance_uuid.empty() ) - { - elog ("supplied instance uuid was null\n"); - return (FAIL_INVALID_UUID); - } - - /** Loop over all hosts looking for this instance. */ - for ( struct guest_host * ptr = guest_head ; guest_head ; ptr = ptr->next ) - { - if ( ptr->instance_list.size() != 0 ) - { - for ( ptr->instance_list_ptr = ptr->instance_list.begin(); - ptr->instance_list_ptr != ptr->instance_list.end(); - ptr->instance_list_ptr++ ) - { - if ( !ptr->instance_list_ptr->uuid.compare(instance_uuid)) - { - ilog ("%s removed instance %s\n", - ptr->hostname.c_str(), - instance_uuid.c_str()); - - send_cmd_to_guestServer ( ptr->hostname, - MTC_CMD_DEL_INST, - instance_uuid, - ptr->instance_list_ptr->heartbeat.reporting ); - - ptr->instance_list.erase(ptr->instance_list_ptr); - - return (PASS) ; - } - else - { - jlog ("%s %s:%s (search)\n", - ptr->hostname.c_str(), - ptr->instance_list_ptr->uuid.c_str(), - instance_uuid.c_str()); - } - } - } - if (( ptr->next == NULL ) || ( ptr == guest_tail )) - break ; - } - wlog ("instance was not found '%s'\n", instance_uuid.c_str()); - return (rc); -} - -/** - * Change the host level fault repoorting state for the specified host. - * - * TODO: Consider sending a MOD_HOST command to the guestServer - * - **/ -int guestHostClass::host_inst ( string hostname, mtc_cmd_enum command ) -{ - int rc = FAIL_NOT_FOUND ; - - struct guestHostClass::guest_host * ptr = static_cast(NULL); - - if ( hostname.empty() ) - { - elog ("no hostname specified\n"); - return (FAIL_STRING_EMPTY); - } - ptr = guestHostClass::getHost(hostname); - if ( ptr ) - { - if ( command == MTC_CMD_ENABLE ) - { - ptr->reporting = true ; - ilog ("%s host level heartbeat reporting is Enabled\n", hostname.c_str()); - send_cmd_to_guestServer ( hostname, MTC_CMD_MOD_HOST, ptr->uuid, true ); - } - else - { - ptr->reporting = false ; - ilog ("%s host level heartbeat reporting is Disabled\n", hostname.c_str()); - send_cmd_to_guestServer ( hostname, MTC_CMD_MOD_HOST, ptr->uuid, false ); - } - rc = PASS ; - } - return (rc); -} - - -instInfo * guestHostClass::get_inst ( string instance_uuid ) -{ - if ( instance_uuid.empty() ) - { - elog ("empty instance uuid\n"); - return (NULL); - } - - /** Loop over all hosts looking for this instance. */ - for ( struct guest_host * ptr = guest_head ; guest_head ; ptr = ptr->next ) - { - if ( ptr->instance_list.size() != 0 ) - { - for ( ptr->instance_list_ptr = ptr->instance_list.begin(); - ptr->instance_list_ptr != ptr->instance_list.end(); - ptr->instance_list_ptr++ ) - { - if ( !ptr->instance_list_ptr->uuid.compare(instance_uuid)) - { - dlog ("%s found instance %s\n", - ptr->hostname.c_str(), - ptr->instance_list_ptr->uuid.c_str()); - - return ( &(*ptr->instance_list_ptr) ); - } - } - } - if (( ptr->next == NULL ) || ( ptr == guest_tail )) - break ; - } - return (NULL); -} - -/** returns he number of instances on this host */ -int guestHostClass::num_instances ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr != NULL ) - { - return ( guest_host_ptr->instance_list.size()); - } - return ( 0); -} - -/****************************************************************************/ -/** Host Class Setter / Getters */ -/****************************************************************************/ - -struct guestHostClass::guest_host * guestHostClass::getHost_timer ( timer_t tid ) -{ - /* check for empty list condition */ - if ( tid != NULL ) - { - for ( struct guest_host * host_ptr = guest_head ; guest_head ; host_ptr = host_ptr->next ) - { - if ( host_ptr->host_audit_timer.tid == tid ) - { - return host_ptr ; - } - if (( host_ptr->next == NULL ) || ( host_ptr == guest_tail )) - break ; - } - } - return static_cast(NULL); -} - -static string null_str = "" ; -string guestHostClass::get_host_name ( string uuid ) -{ - guest_host * guest_host_ptr = getHost ( uuid ); - if ( guest_host_ptr != NULL ) - { - return ( guest_host_ptr->hostname ); - } - return ( null_str ); -} - -string guestHostClass::get_host_uuid ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr != NULL ) - { - return ( guest_host_ptr->uuid ); - } - return ( null_str ); -} - - - - - -string guestHostClass::get_inst_host_name ( string instance_uuid ) -{ - if ( instance_uuid.empty() ) - { - elog ("empty instance uuid\n"); - return (null_str); - } - /** Loop over all hosts looking for this instance. */ - for ( struct guest_host * ptr = guest_head ; guest_head ; ptr = ptr->next ) - { - if ( ptr->instance_list.size() != 0 ) - { - for ( ptr->instance_list_ptr = ptr->instance_list.begin(); - ptr->instance_list_ptr != ptr->instance_list.end(); - ptr->instance_list_ptr++ ) - { - if ( !ptr->instance_list_ptr->uuid.compare(instance_uuid)) - { - dlog ("%s found instance %s\n", - ptr->hostname.c_str(), - ptr->instance_list_ptr->uuid.c_str()); - - return ( ptr->hostname ); - } - } - } - if (( ptr->next == NULL ) || ( ptr == guest_tail )) - break ; - } - return ( null_str ); -} - -/** - * Set and Get a bool that indicates whether we already - * got the host reporting state from the VIM. - * - * The VIM might not be running at the time this daemon - * is started so we need to retry until we get it - **/ -void guestHostClass::set_got_host_state ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - guest_host_ptr->got_host_state = true ; - } - else - { - wlog ("%s not found\n", hostname.c_str()); - } -} - -bool guestHostClass::get_got_host_state ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - return ( guest_host_ptr->got_host_state ); - } - else - { - wlog ("%s not found\n", hostname.c_str()); - } - return (false); -} - -void guestHostClass::set_got_instances ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - guest_host_ptr->got_instances = true ; - } - else - { - wlog ("%s not found\n", hostname.c_str()); - } -} - -bool guestHostClass::get_got_instances ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - return ( guest_host_ptr->got_instances ); - } - else - { - wlog ("%s not found\n", hostname.c_str()); - } - return (false); -} - -bool guestHostClass::get_reporting_state ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - return ( guest_host_ptr->reporting ); - } - else - { - wlog ("%s not found\n", hostname.c_str()); - } - return ( false ); -} - -int guestHostClass::set_reporting_state( string hostname, bool reporting ) -{ - int rc = PASS ; - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - guest_host_ptr->reporting = reporting ; - } - else - { - wlog ("%s not found\n", hostname.c_str()); - rc = FAIL_NOT_FOUND ; - } - return (rc); -} - - -string guestHostClass::get_host_ip ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - return ( guest_host_ptr->ip ); - } - return ( null_str ); -} - -void guestHostClass::set_query_flag ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - guest_host_ptr->query_flag = true ; - } -} - -void guestHostClass::clr_query_flag ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - guest_host_ptr->query_flag = false ; - } -} - -bool guestHostClass::get_query_flag ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - return ( guest_host_ptr->query_flag ); - } - return ( false ); -} - -int guestHostClass::set_inst_state ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - for ( guest_host_ptr->instance_list_ptr = guest_host_ptr->instance_list.begin(); - guest_host_ptr->instance_list_ptr != guest_host_ptr->instance_list.end(); - guest_host_ptr->instance_list_ptr++ ) - { - send_cmd_to_guestServer ( hostname, MTC_CMD_MOD_INST, - guest_host_ptr->instance_list_ptr->uuid, - guest_host_ptr->instance_list_ptr->heartbeat.reporting ); - } - } - return (PASS); -} - -void guestHostClass::inc_query_misses ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - guest_host_ptr->query_misses++ ; - } - else - { - /* TODO: turn into a wlog_throttled ... */ - dlog ("%s not found\n", hostname.c_str()); - } -} - -void guestHostClass::clr_query_misses ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - guest_host_ptr->query_misses = 0 ; - } - else - { - /* TODO: turn into a wlog_throttled ... */ - dlog ("%s not found\n", hostname.c_str()); - } -} - -int guestHostClass::get_query_misses ( string hostname ) -{ - guest_host * guest_host_ptr = getHost ( hostname ); - if ( guest_host_ptr ) - { - return ( guest_host_ptr->query_misses ) ; - } - else - { - /* TODO: turn into a wlog_throttled ... */ - dlog ("%s not found\n", hostname.c_str()); - } - return (-1); -} - -/************************************************************************** - * - * Name : getEvent - * - * Purpose : Return a reference to a host or instance level libEvent. - * - **************************************************************************/ -libEvent & guestHostClass::getEvent ( struct event_base * base_ptr, string & hostname ) -{ - struct guest_host * guest_ptr = static_cast(NULL) ; - - /* check for empty list condition */ - if ( guest_head == NULL ) - return (nullEvent) ; - - if ( base_ptr == NULL ) - return (nullEvent) ; - - /** Loop over all hosts looking for this instance. */ - for ( guest_ptr = guest_head ; guest_ptr != NULL ; guest_ptr = guest_ptr->next ) - { - if ( guest_ptr->vimEvent.base == base_ptr ) - { - dlog2 ("%s Found Event Base Pointer (host) (%p)\n", - guest_ptr->vimEvent.uuid.c_str(), - guest_ptr->vimEvent.base); - - /* Update the reference variable */ - hostname = guest_ptr->hostname ; - - return (guest_ptr->vimEvent) ; - } - else if ( guest_ptr->instance_list.size() ) - { - for ( guest_ptr->instance_list_ptr = guest_ptr->instance_list.begin(); - guest_ptr->instance_list_ptr != guest_ptr->instance_list.end(); - guest_ptr->instance_list_ptr++ ) - { - if ( guest_ptr->instance_list_ptr->vimEvent.base == base_ptr ) - { - dlog2 ("%s Found Event Base Pointer (instance) (%p)\n", - guest_ptr->instance_list_ptr->uuid.c_str(), - guest_ptr->instance_list_ptr->vimEvent.base); - - /* Update the reference variable */ - hostname = guest_ptr->hostname ; - - return (guest_ptr->instance_list_ptr->vimEvent) ; - } - } - } - if (( guest_ptr->next == NULL ) || ( guest_ptr == guest_tail )) - break ; - } - return (nullEvent) ; -} - -libEvent & guestHostClass::get_host_event ( string hostname ) -{ - guestHostClass::guest_host * guest_host_ptr ; - guest_host_ptr = guestHostClass::getHost ( hostname ); - if ( guest_host_ptr ) - { - return ( guest_host_ptr->vimEvent ); - } - else - { - wlog ("%s not found\n", hostname.c_str()); - } - return ( nullEvent ); -} - -/***************************************************************************** - * Memory Dump Stuff * - *****************************************************************************/ -void guestHostClass::print_node_info ( void ) -{ - fflush (stdout); - fflush (stderr); -} - -void guestHostClass::mem_log_info ( void ) -{ - char str[MAX_MEM_LOG_DATA] ; - snprintf (&str[0], MAX_MEM_LOG_DATA, "Hosts:%d Allocs:%d Memory:%d\n", hosts, memory_allocs, memory_used ); - mem_log (str); -} - -void guestHostClass::mem_log_info_host ( struct guestHostClass::guest_host * guest_host_ptr ) -{ - char str[MAX_MEM_LOG_DATA] ; - snprintf (&str[0], MAX_MEM_LOG_DATA, "%s:%s\n", guest_host_ptr->hostname.c_str(), guest_host_ptr->ip.c_str()); - mem_log (str); -} - -void mem_log_delimit_host ( void ) -{ - char str[MAX_MEM_LOG_DATA] ; - snprintf (&str[0], MAX_MEM_LOG_DATA, "-------------------------------------------------------------\n"); - mem_log (str); -} - -void guestHostClass::mem_log_info_inst ( struct guestHostClass::guest_host * ptr ) -{ - char str[MAX_MEM_LOG_DATA] ; - if ( ptr->instance_list.size() ) - { - for ( ptr->instance_list_ptr = ptr->instance_list.begin(); - ptr->instance_list_ptr != ptr->instance_list.end(); - ptr->instance_list_ptr++ ) - { - snprintf (&str[0], MAX_MEM_LOG_DATA, - " %s %s Faults:%d %s %s\n", - ptr->instance_list_ptr->uuid.data(), - ptr->instance_list_ptr->hostname.data(), - ptr->instance_list_ptr->heartbeat.failures, - ptr->instance_list_ptr->heartbeat.provisioned ? "provisioned" : "", - ptr->instance_list_ptr->heartbeat.reporting ? "reporting" : ""); - mem_log (str); - - snprintf (&str[0], MAX_MEM_LOG_DATA, - " Timeouts: Restart:%s Resume:%s Suspend:%s Shutdown:%s Vote:%s\n", - ptr->instance_list_ptr->restart_to_str.data(), - ptr->instance_list_ptr->resume_to_str.data(), - ptr->instance_list_ptr->suspend_to_str.data(), - ptr->instance_list_ptr->shutdown_to_str.data(), - ptr->instance_list_ptr->vote_to_str.data()); - mem_log (str); - - // mem_log_delimit_host (); - } - } - else - { - snprintf (&str[0], MAX_MEM_LOG_DATA, "no instances\n"); - mem_log (str); - } -} - - -void guestHostClass::memDumpNodeState ( string hostname ) -{ - guestHostClass::guest_host* guest_host_ptr ; - guest_host_ptr = guestHostClass::getHost ( hostname ); - if ( guest_host_ptr == NULL ) - { - mem_log ( hostname, ": ", "Not Found in guestHostClass\n" ); - return ; - } - else - { - mem_log_info_host ( guest_host_ptr ); - } -} - -void guestHostClass::memDumpAllState ( void ) -{ - guestHostClass::hostBase.memLogDelimit (); - - mem_log_info ( ); - - /* walk the node list looking for nodes that should be monitored */ - for ( struct guest_host * ptr = guest_head ; ptr != NULL ; ptr = ptr->next ) - { - memDumpNodeState ( ptr->hostname ); - if ( (ptr->hosttype & COMPUTE_TYPE) == COMPUTE_TYPE) - { - mem_log_info_inst ( ptr ); - } - guestHostClass::hostBase.memLogDelimit (); - } -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestClass.h b/mtce-common/cgts-mtce-common-1.0/guest/guestClass.h deleted file mode 100644 index 2cb3af6d..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestClass.h +++ /dev/null @@ -1,202 +0,0 @@ -#ifndef __INCLUDE_GUESTCLASS_H__ -#define __INCLUDE_GUESTCLASS_H__ - -/* - * Copyright (c) 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -#include "guestBase.h" -#include "httpUtil.h" /* for ... libEvent and httpUtil_... */ -#include "hostClass.h" - -typedef enum -{ - STAGE__START, - STAGES -} guest_stage_enum ; - - -class guestHostClass -{ - private: - struct guest_host { - - /** Pointer to the previous / next host in the list */ - struct guest_host * prev; - struct guest_host * next; - - string hostname ; - string uuid ; - string ip ; - int hosttype ; - - /** - * Top level gate for the host. - * If false then reporting for all instances are off. - */ - bool reporting; - - bool query_flag ; - int query_misses ; - - /** Instance level Audit timer */ - struct mtc_timer host_audit_timer; - - /** flag that indicates we were able to fetch host state from the VIM */ - bool got_host_state ; - - /** flag that indicates we were able to fetch intances from the VIM */ - bool got_instances ; - - /** Main FSM stage */ - guest_stage_enum stage ; - - /* List of instances for this host */ - list instance_list ; - list::iterator instance_list_ptr; - - libEvent vimEvent ; - }; - - /** List of allocated host memory. - * - * An array of host pointers. - */ - guest_host * host_ptrs[MAX_HOSTS] ; - - /** A memory allocation counter. - * - * Should represent the number of hosts in the linked list. - */ - int memory_allocs ; - - /** A memory used counter - * - * A variable storing the accumulated host memory - */ - int memory_used ; - - - // struct hostBaseClass::host* getHost ( string hostname ); - - struct guest_host * guest_head ; /**< Host Linked List Head pointer */ - struct guest_host * guest_tail ; /**< Host Linked List Tail pointer */ - - struct guestHostClass::guest_host* newHost ( void ); - struct guestHostClass::guest_host* addHost ( string hostname ); - struct guestHostClass::guest_host* getHost ( string hostname ); - int remHost ( string hostname ); - int delHost ( struct guestHostClass::guest_host * guest_host_ptr ); - struct guestHostClass::guest_host* getHost_timer ( timer_t tid ); - - libEvent & getEvent ( struct event_base * base_ptr, string & hostname ); - - const - char * get_guestStage_str ( struct guestHostClass::guest_host * guest_host_ptr ); - int guestStage_change ( struct guestHostClass::guest_host * guest_host_ptr, guest_stage_enum newStage ); - - void mem_log_info ( void ); - void mem_log_info_host ( struct guestHostClass::guest_host * guest_host_ptr ); - void mem_log_info_inst ( struct guestHostClass::guest_host * guest_host_ptr ); - - public: - - guestHostClass(); /**< constructor */ - ~guestHostClass(); /**< destructor */ - - hostBaseClass hostBase ; - - bool exit_fsm ; - void run_fsm ( string hostname ); - - bool audit_run ; - - /** Host level Audit timer */ - struct mtc_timer audit_timer; - - /** This is a list of host names. */ - std::list hostlist ; - std::list::iterator hostlist_iter_ptr ; - - // void guest_fsm ( void ); - - int hosts ; - - /* For select dispatch */ - struct timeval waitd ; - - fd_set inotify_readfds ; - fd_set instance_readfds ; - fd_set message_readfds ; - - int add_host ( string uuid, string address, string hostname, string nodetype ); - int mod_host ( string uuid, string address, string hostname, string nodetype ); - int del_host ( string hostname ); /* delete the host from the daemon - mtcAgent */ - int rem_host ( string hostname ); - - /** Delete all instances for this host */ - int del_host_inst ( string host_uuid ); - - int add_inst ( string hostname, instInfo & instance ); - int mod_inst ( string hostname, instInfo & instance ); - int del_inst ( string instance ); - instInfo * get_inst ( string instance ); - - /* The handler that lib event calls to handle the return response */ - void guestVimApi_handler ( struct evhttp_request *req, void *arg ); - - /** - * Change all the instance service states to enabled or disable - * for the specified host. - **/ - int host_inst( string hostname , mtc_cmd_enum command ); - - /** - * Set and Get a bool that indicates whether we already - * got the host reporting state from the VIM. - * - * The VIM might not be running at the time this daemon - * is started so we need to retry until we get it - **/ - void set_got_host_state ( string hostname ); - bool get_got_host_state ( string hostname ); - void set_got_instances ( string hostname ); - bool get_got_instances ( string hostname ); - - /** returns he number of instances on this host */ - int num_instances ( string hostname ); - - string get_host_name ( string host_uuid ); - string get_host_uuid ( string hostname ); - string get_host_ip ( string hostname ); - string get_inst_host_name ( string instance_uuid ); - - /* Send the instance reporting state to the guestServer on that host - * primarily used to preiodically refresh instance reporting state or - * set it when the guestServer seems to have restarted */ - int set_inst_state ( string hostname ); - - libEvent & get_host_event ( string hostname ); - - void inc_query_misses ( string hostname ); - void clr_query_misses ( string hostname ); - int get_query_misses ( string hostname ); - void set_query_flag ( string hostname ); - void clr_query_flag ( string hostname ); - bool get_query_flag ( string hostname ); - - bool get_reporting_state( string hostname ); - int set_reporting_state( string hostname, bool enabled ); - - void memLogDelimit ( void ); /**< Debug log delimiter */ - void memDumpNodeState ( string hostname ); - void memDumpAllState ( void ); - void print_node_info ( void ); /**< Print node info banner */ -}; - -guestHostClass * get_hostInv_ptr ( void ); - -#endif /* __INCLUDE_GUESTCLASS_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.cpp deleted file mode 100644 index d8c651d2..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.cpp +++ /dev/null @@ -1,1092 +0,0 @@ -/* - * Copyright (c) 2015-2017 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** @file Wind River Titanium Cloud Guest Daemon's HTTP Server */ - -#ifdef __AREA__ -#undef __AREA__ -#endif -#define __AREA__ "gst" - -#include -#include -#include -#include /* for ... inet_addr , inet_ntoa */ -#include /* for ... LOOPBACK_IP */ -#include /* for ... HTTP_ status definitions */ -#include - -using namespace std; - -#include "daemon_common.h" /* */ - -#include "nodeBase.h" /* Service header */ -#include "nodeTimers.h" /* */ -#include "nodeUtil.h" /* */ -#include "jsonUtil.h" /* for ... jsonUtil_get_key_val */ - -#include "guestUtil.h" /* for ... guestUtil_inst_init */ -#include "guestClass.h" /* */ -#include "guestHttpSvr.h" /* for ... this module */ -#include "guestVimApi.h" /* for ... guestVimApi_inst_action */ - -extern int send_event_to_mtcAgent ( string hostname, unsigned int event); - -/* Used for log messages */ -#define GUEST_SERVER "HTTP Guest Server" - -/** - * HTTP commands level is specified in the URL as either - * of the following ; both are at v1 - **/ -#define HOST_LEVEL_URL "/v1/hosts/" -#define INST_LEVEL_URL "/v1/instances/" - -/* Commands require the "User Agent" to be set to SERVICE_VERSION */ -#define USER_AGENT "User-Agent" -#define SERVICE_VERSION "vim/1.0" - -/* This servers's request structure */ -static request_type guest_request ; - -int sequence = 0 ; -char log_str [MAX_API_LOG_LEN]; -char filename[MAX_FILENAME_LEN]; - -/* Module Cleanup */ -void guestHttpSvr_fini ( void ) -{ - if ( guest_request.fd ) - { - if ( guest_request.base ) - { - event_base_free( guest_request.base); - } - close ( guest_request.fd ); - } -} - -/* Look for events */ -void guestHttpSvr_look ( void ) -{ - /* Look for INV Events */ - if ( guest_request.base ) - event_base_loop( guest_request.base, EVLOOP_NONBLOCK ); -} - -/** - * Formulates and updates the resp_buffer reference - * variable based on the specified error code - **/ -string _create_error_response ( int error_code ) -{ - string resp_buffer = "{" ; - resp_buffer.append (" \"status\" : \"fail\""); - switch (error_code) - { - case FAIL_KEY_VALUE_PARSE: - { - resp_buffer.append (",\"reason\" : \"command parse error\""); - break ; - } - case FAIL_JSON_ZERO_LEN: - { - resp_buffer.append (",\"reason\" : \"no buffer\""); - break ; - } - case FAIL_NOT_FOUND: - { - resp_buffer.append (",\"reason\" : \"entity not found\""); - break ; - - } - case FAIL_INVALID_DATA: - { - resp_buffer.append (",\"reason\" : \"invalid data\""); - break ; - } - case FAIL_BAD_STATE: - { - resp_buffer.append (",\"reason\" : \"bad state\""); - break ; - } - case FAIL_BAD_CASE: - { - resp_buffer.append (",\"reason\" : \"unsupported http command\""); - break ; - } - default: - { - ; - } - } - resp_buffer.append ("}"); - - return (resp_buffer); -} - -/******************************************************************** - * - * Name : _get_service_level - * - * Description: Verify this request contains - * - * 1. valid service level specification in the URL and - * 2. the expected User-Agent value - * - ********************************************************************/ -service_level_enum _get_service_level ( struct evhttp_request *req ) -{ - service_level_enum service_level = SERVICE_LEVEL_NONE ; - - /* Parse Headers we care about to verify that it also contains the correct User-Agent header */ - struct evkeyvalq * headers_ptr = evhttp_request_get_input_headers (req); - const char * header_value_ptr = evhttp_find_header (headers_ptr, USER_AGENT); - if ( header_value_ptr ) - { - if ( strncmp ( header_value_ptr, SERVICE_VERSION, 20 ) ) - { - elog ("Request missing required '%s=%s' (%s)\n", - USER_AGENT, SERVICE_VERSION, header_value_ptr ); - return (service_level); - } - } - - /* get the URL string */ - const char * url_ptr = evhttp_request_get_uri (req); - jlog1 ("URI: %s\n", url_ptr ); - - /* look for the supported service levels in the url */ - const char * service_level_ptr = strstr ( url_ptr, HOST_LEVEL_URL); - if ( service_level_ptr ) - { - service_level = SERVICE_LEVEL_HOST ; - } - else - { - service_level_ptr = strstr ( url_ptr, INST_LEVEL_URL); - if ( service_level_ptr ) - { - service_level = SERVICE_LEVEL_INST ; - } - } - if ( service_level == SERVICE_LEVEL_NONE ) - { - elog ("Unsupported service level (url:%s)\n", url_ptr ); - return (service_level); - } - return (service_level); -} - - - -string _update_services_response ( string hostname, string uuid, instInfo * instinfo_ptr ) -{ - string response = ("{"); - response.append ("\"uuid\":\""); - response.append (uuid); - response.append ("\","); - response.append ("\"hostname\":\""); - response.append (hostname); - response.append ("\","); - response.append ("\"services\": [{ \"service\":\"heartbeat\","); - - response.append ("\"state\":\""); - if ( instinfo_ptr->heartbeat.reporting == true ) - response.append ("enabled"); - else - response.append ("disabled"); - - response.append ("\",\"restart-timeout\":\""); - if ( instinfo_ptr->heartbeating == true ) - { - response.append (instinfo_ptr->restart_to_str); - response.append ("\",\"status\":\""); - response.append ("enabled\"}]}"); - } - else - { - response.append ("0\",\"status\":\""); - response.append ("disabled\"}]}"); - } - return (response); -} - -/***************************************************************************** - * - * Name: guestHttpSvr_vim_req - * - * Handles three 'operations' - * - * 'delete' - based on uuid - * 'modify' - based on list of key - value pairs - * 'add' - based on inventory record - * - ****************************************************************************** - * Test Commands: - * - -Add Instance: -curl -i -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df10449d -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df10449d", "channel" : "cgts-instance000001", "services" : ["heartbeat"]}' - - - -Disable Instance: heartbeat -curl -i -X PUT -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df10449d -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df10449d", "channel" : "cgts-instance000001", "services" : [{"service":"heartbeat" , "state":"disabled"}]}' - -Delete Host: -curl -i -X DELETE -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/8aee436e-d564-459e-a0d8-26c44792a9df - -Enable Host: heartbeat -curl -i -X PUT -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/8aee436e-d564-459e-a0d8-26c44792a9df/enable -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df10449d"}' - -Enable Host: heartbeat -curl -i -X GET -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df10449d - -*/ - -/********************************************************************************* - * - * Name : guestHttpSvr_host_req - * - * Description : Handles host level VIM requests - * - ********************************************************************************/ -string guestHttpSvr_host_req ( char * buffer_ptr, - mtc_cmd_enum command, - evhttp_cmd_type http_cmd, - int & http_status_code ) -{ - string response = "" ; - string hostname = "" ; - - int rc = jsonUtil_get_key_val ( buffer_ptr, MTC_JSON_INV_NAME, hostname ); - - if ( rc ) - { - wlog ("Failed to parse command key values (%d)\n", rc ); - ilog ("... %s\n", buffer_ptr ); - - response = _create_error_response ( FAIL_KEY_VALUE_PARSE ); - http_status_code = HTTP_BADREQUEST ; - } - else - { - guestHostClass * obj_ptr = get_hostInv_ptr (); - - string instance_info = "" ; - string instance_uuid = "" ; - string instance_chan = "" ; - - /* WARNING: We only support a single list element for now */ - list services_list ; - services_list.clear() ; - - switch ( http_cmd ) - { - case EVHTTP_REQ_PUT: - { - qlog ("%s VIM CMD: Enable Host\n", hostname.c_str()); - - rc = obj_ptr->host_inst ( hostname, command ); - if ( rc ) - { - elog ("%s Host Enable Request (vim) - Host Not Found\n", hostname.c_str()); - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - - /* Ask mtce for an inventory update */ - send_event_to_mtcAgent ( obj_ptr->hostBase.my_hostname, MTC_EVENT_MONITOR_READY ) ; - - } - else - { - http_status_code = HTTP_OK ; - response = " { \"status\" : \"pass\" }" ; - } - break ; - } - default: - { - wlog ("%s Unsupported http command '%s'\n", - hostname.c_str(), getHttpCmdType_str(http_cmd)); - response = _create_error_response ( FAIL_BAD_CASE ); - http_status_code = HTTP_BADREQUEST ; - } - } - } - return (response); -} - -/********************************************************************************* - * - * Name : _get_key_val - * - * Description : Get valid value from http message and generate error if failed - * - ********************************************************************************/ -int _get_key_val ( char * buffer_ptr, - string key, - string & value, - int & http_status_code, - string & response ) -{ - int rc = jsonUtil_get_key_val ( buffer_ptr, key, value ); - - if ( rc ) - { - wlog ("Failed to extract %s from message\n", key.c_str()); - http_status_code = HTTP_BADREQUEST ; - response = _create_error_response ( FAIL_KEY_VALUE_PARSE ); - } - return rc; -} - -/********************************************************************************* - * - * Name : _get_list - * - * Description : Get valid list from http message and generate error if failed - * - ********************************************************************************/ -int _get_list ( char * buffer_ptr, - string key, - list & list, - int & http_status_code, - string & response ) -{ - int rc = jsonUtil_get_list ( buffer_ptr, key, list ); - - if ( rc ) - { - wlog ("Failed to extract %s from message\n", key.c_str()); - http_status_code = HTTP_BADREQUEST ; - response = _create_error_response ( FAIL_KEY_VALUE_PARSE ); - } - return rc; -} - -#define EVENT_VOTE "vote" -#define EVENT_STOP "stop" -#define EVENT_REBOOT "reboot" -#define EVENT_PAUSE "pause" -#define EVENT_UNPAUSE "unpause" -#define EVENT_SUSPEND "suspend" -#define EVENT_RESUME "resume" -#define EVENT_LIVE_MIGRATE_BEGIN "live_migrate_begin" -#define EVENT_LIVE_MIGRATE_END "live_migrate_end" -#define EVENT_COLD_MIGRATE_BEGIN "cold_migrate_begin" -#define EVENT_COLD_MIGRATE_END "cold_migrate_end" - -string _get_action_timeout ( instInfo * instInfo_ptr, string action ) -{ - if ( instInfo_ptr->heartbeating == false ) - { - ilog ("%s returning timeout of zero while not heartbeating for action '%s'\n", - log_prefix(instInfo_ptr).c_str(), action.c_str()); - return ("0"); - } - if ( !action.compare (EVENT_VOTE) ) - return (instInfo_ptr->vote_to_str); - - if ( !action.compare (EVENT_STOP) ) - return (instInfo_ptr->shutdown_to_str); - if ( !action.compare (EVENT_REBOOT) ) - return (instInfo_ptr->shutdown_to_str); - if ( !action.compare (EVENT_PAUSE) ) - return (instInfo_ptr->suspend_to_str); - if ( !action.compare (EVENT_UNPAUSE) ) - return (instInfo_ptr->resume_to_str); - if ( !action.compare (EVENT_SUSPEND) ) - return (instInfo_ptr->suspend_to_str); - if ( !action.compare (EVENT_RESUME) ) - return (instInfo_ptr->resume_to_str); - - if ( !action.compare (EVENT_LIVE_MIGRATE_BEGIN) ) - return (instInfo_ptr->suspend_to_str); - if ( !action.compare (EVENT_LIVE_MIGRATE_END) ) - return (instInfo_ptr->resume_to_str); - if ( !action.compare (EVENT_COLD_MIGRATE_BEGIN) ) - return (instInfo_ptr->suspend_to_str); - if ( !action.compare (EVENT_COLD_MIGRATE_END) ) - return (instInfo_ptr->resume_to_str); - - ilog ("%s returning timeout of zero for invalid action '%s'\n", - log_prefix(instInfo_ptr).c_str(), action.c_str()); - - return ("0"); -} - -/********************************************************************************* - * - * Name : guestHttpSvr_inst_req - * - * Description : Handles instance level VIM requests - * - ********************************************************************************/ -string guestHttpSvr_inst_req ( char * buffer_ptr, - mtc_cmd_enum command, - evhttp_cmd_type http_cmd, - int & http_status_code ) -{ - string response = "" ; - string hostname = "" ; - string instance_uuid = "" ; - - _get_key_val ( buffer_ptr, MTC_JSON_INV_NAME, hostname, http_status_code, response); - if ( _get_key_val ( buffer_ptr, MTC_JSON_INV_NAME, hostname, http_status_code, response )) - return (response); - - if ( _get_key_val ( buffer_ptr, "uuid", instance_uuid, http_status_code, response )) - return (response); - - instInfo instance_info ; guestUtil_inst_init ( &instance_info ); - instance_info.uuid = instance_uuid; - - guestHostClass * obj_ptr = get_hostInv_ptr (); - - /* WARNING: We only support a single list element for now */ - list services_list ; - services_list.clear() ; - - switch ( http_cmd ) - { - case EVHTTP_REQ_POST: - { - if ( MTC_CMD_VOTE == command ) - { - jlog ("vote instance Info: %s", buffer_ptr ); - - string action = ""; - if ( _get_key_val (buffer_ptr, "action", action, http_status_code, response ) ) - return (response); - - qlog ("VIM CMD: Vote instance %s\n", - instance_info.uuid.c_str()); - - instInfo * instInfo_ptr = obj_ptr->get_inst ( instance_uuid ); - if ( instInfo_ptr ) - { - response = ("{\"uuid\":\""); - response.append (instance_uuid); - response.append ("\",\"hostname\":\""); - response.append (hostname); - response.append ("\",\"action\":\""); - response.append (action); - response.append ("\",\"timeout\":\""); - response.append (_get_action_timeout ( instInfo_ptr, EVENT_VOTE )); - response.append ("\"}"); - - jlog ("%s %s Vote Response: %s\n", hostname.c_str(), - instance_uuid.c_str(), - response.c_str()); - - - if ( instInfo_ptr->heartbeating ) - send_cmd_to_guestServer (hostname, MTC_CMD_VOTE_INST, instance_uuid, true, action); - } - else - { - elog ("%s %s vote request (from vim) - Instance Not Found\n", hostname.c_str(), instance_uuid.c_str()); - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - } - } - else if ( MTC_CMD_NOTIFY == command ) - { - jlog ("notify instance Info: %s", buffer_ptr ); - - string action = ""; - if ( _get_key_val (buffer_ptr, "action", action, http_status_code, response )) - return (response); - - qlog ("%s %s VIM CMD: Notify instance\n", - hostname.c_str(), instance_info.uuid.c_str()); - - instInfo * instInfo_ptr = obj_ptr->get_inst ( instance_uuid ); - if ( instInfo_ptr ) - { - response = ("{\"uuid\":\""); - response.append (instance_uuid); - response.append ("\",\"hostname\":\""); - response.append (hostname); - response.append ("\",\"action\":\""); - response.append (action); - response.append ("\",\"timeout\":\""); - response.append (_get_action_timeout ( instInfo_ptr , action )); - response.append ("\"}"); - - jlog ("%s %s Notify Response: %s\n", hostname.c_str(), instInfo_ptr->uuid.c_str(), response.c_str()); - - if ( instInfo_ptr->heartbeating ) - send_cmd_to_guestServer (hostname, MTC_CMD_NOTIFY_INST, instance_uuid, true, action); - } - else - { - elog ("%s %s notify request (vim) - Instance Not Found\n", hostname.c_str(), instance_uuid.c_str()); - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - } - } - /* Add instance */ - else - { - if ( _get_list (buffer_ptr, "services", services_list, http_status_code, response )) - return (response); - - string service = services_list.front(); - qlog ("%s %s VIM CMD: Add Instance\n", - hostname.c_str(), - instance_info.uuid.c_str()); - - ilog ("%s %s add request (from vim) (%s)\n", - hostname.c_str(), - instance_info.uuid.c_str(), - service.c_str()); - - if ( obj_ptr->add_inst ( hostname , instance_info ) != PASS ) - { - response = _create_error_response ( FAIL_INVALID_DATA ); - http_status_code = HTTP_BADREQUEST ; - } - else - { - instance_info.heartbeat.provisioned = true ; - response = " { \"status\" : \"pass\" }" ; - } - } - break ; - } - /* PATCH is used to control service states ; enable or disable */ - case EVHTTP_REQ_PATCH: - { - if ( _get_list (buffer_ptr, "services", services_list, http_status_code, response ) ) - return (response); - - jlog ("%s modify instance (%s)", hostname.c_str(), buffer_ptr ); - - string service , state ; - string services = services_list.front() ; - jsonUtil_get_key_val ( (char*)services.data(), "service", service ); - jsonUtil_get_key_val ( (char*)services.data(), "state" , state ); - - qlog ("%s %s VIM CMD: Modify Instance\n", - hostname.c_str(), - instance_info.uuid.c_str()); - - if ( service.compare("heartbeat")) - { - response = _create_error_response ( FAIL_INVALID_DATA ); - http_status_code = HTTP_BADREQUEST ; - return (response); - } - else if ( !state.compare("enabled")) - instance_info.heartbeat.reporting = true; - else if ( !state.compare("disabled")) - instance_info.heartbeat.reporting = false; - else - { - elog ("%s modify request (vim) - invalid instance state '%s'\n", hostname.c_str(), state.c_str()); - response = _create_error_response ( FAIL_BAD_STATE ); - http_status_code = HTTP_BADREQUEST ; - return (response); - } - int rc = obj_ptr->mod_inst ( hostname, instance_info ); - if ( rc ) - { - elog ("%s %s modify request (vim) - Instance Not Found\n", - hostname.c_str(), instance_info.uuid.c_str()); - - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - return (response); - } - else - { - instInfo * instInfo_ptr = obj_ptr->get_inst ( instance_info.uuid ); - if ( instInfo_ptr ) - { - response = _update_services_response ( hostname , instInfo_ptr->uuid, instInfo_ptr ); - http_status_code = HTTP_OK ; - } - else - { - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - } - } - break ; - } - default: - { - wlog ("%s Unsupported HTTP '%s' request\n", instance_uuid.c_str(), getHttpCmdType_str(http_cmd)); - } - } - return (response); -} - -/***************************************************************************** - * - * Name: guestHttpSvr_vimCmdHdlr - * - * Description: Receive an http request extract the request type and buffer from - * it and call process request handler. - * Send the processed message response back to the connection. - * - * Supported requests include: POST, PUT, DELETE - * - ******************************************************************************/ - -int _get_url_info ( struct evhttp_request * req, - const char * url_ptr, - url_info_type & url_info ) -{ - size_t len = 0 ; - - /* Extract the service level from the request URL ; host or instance */ - url_info.service_level = _get_service_level ( req ); - if ( url_info.service_level == SERVICE_LEVEL_NONE ) - { - return ( FAIL_INVALID_DATA ); - } - - /* Remove the service level from the URL */ - if ( url_info.service_level == SERVICE_LEVEL_HOST ) - { - url_ptr = strstr ( url_ptr, HOST_LEVEL_URL ); - len = strlen ( HOST_LEVEL_URL ); - } - else - { - url_ptr = strstr ( url_ptr, INST_LEVEL_URL); - len = strlen ( INST_LEVEL_URL ); - } - - if ( url_ptr ) - { - url_ptr += len ; - url_info.temp = url_ptr ; - url_info.uuid = url_info.temp.substr ( 0 , UUID_LEN ); - } - else - { - ilog ("Failed to parse URL (%s)", url_ptr); // DLOG - return (FAIL_INVALID_UUID) ; - } - /** - * Check to see if there is a command enable/disable/etc after the UUID - * ... If what is left on the URL is longer than a UUID then - * there must be a command so lets get that - **/ - if ( url_info.temp.length() > UUID_LEN ) - { - url_info.command = url_info.temp.substr(url_info.uuid.length()+1, string::npos ); - dlog ("Command:%s\n", url_info.command.c_str()); - } - return (PASS); -} - -void guestHttpSvr_vimCmdHdlr (struct evhttp_request *req, void *arg) -{ - int rc ; - struct evbuffer *resp_buf ; - url_info_type url_info ; - - int http_status_code = HTTP_NOTFOUND ; - guestHostClass * obj_ptr = get_hostInv_ptr () ; - string response = _create_error_response ( FAIL_JSON_ZERO_LEN ); - - guest_request.req = req ; - jlog1 ("HTTP Request:%p base:%p Req:%p arg:%p\n", &guest_request, - guest_request.base, - guest_request.req, - arg ); - - /* Get sender must be localhost */ - const char * host_ptr = evhttp_request_get_host (req); - if ( strncmp ( host_ptr , "localhost" , 10 )) - { - wlog ("Message received from unknown host (%s)\n", host_ptr ); - - /* TODO: Fail the request if from unknown host */ - } - - const char * url_ptr = evhttp_request_get_uri (req); - - /* Extract the operation */ - evhttp_cmd_type http_cmd = evhttp_request_get_command (req); - jlog1 ("%s request from '%s'\n", getHttpCmdType_str(http_cmd), host_ptr ); - - /* Log the request */ - snprintf (&filename[0], MAX_FILENAME_LEN, "/var/log/%s_request.log", program_invocation_short_name ); - // snprintf (&log_str[0], MAX_API_LOG_LEN-1, "\n%s [%5d] http request seq: %d with %d request from %s:%s", - snprintf (&log_str[0], MAX_API_LOG_LEN-1, "guest services request '%s' (%d) %s:%s", - getHttpCmdType_str(http_cmd), ++sequence, host_ptr, url_ptr ); - // send_log_message ( "controller-0", &filename[0], &log_str[0] ); - jlog ( "%s", log_str ); - - /* Fill in the url_info struct from the url string in the request */ - rc = _get_url_info ( req, url_ptr, url_info ); - if ( rc ) - { - evhttp_send_error ( req, MTC_HTTP_FORBIDDEN, response.data() ); - return ; - } - - switch ( http_cmd ) - { - case EVHTTP_REQ_DELETE: - { - qlog ("%s VIM CMD: Delete Host or Instance\n", url_info.uuid.c_str()); - if ( url_info.service_level == SERVICE_LEVEL_HOST ) - { - /* Nothing to do at the host level for delete. - * Don't try and do a hostname lookup as it may already have been deleted */ - ilog ("%s delete host services request (vim)\n", url_info.uuid.c_str()); - } - else - { - ilog ("%s delete instance request (vim)\n", url_info.uuid.c_str()); - - rc = obj_ptr->del_inst ( url_info.uuid ); - } - if ( rc ) - { - elog ("%s instance not found\n", url_info.uuid.c_str()); - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - } - else - { - http_status_code = HTTP_NOCONTENT ; - response = "{ \"status\" : \"pass\" }" ; - } - break ; - } - - /** - * GET is handled at this level because - * there is no payload with it. - **/ - case EVHTTP_REQ_GET: - { - if ( url_info.service_level == SERVICE_LEVEL_INST ) - { - instInfo * instance_ptr = obj_ptr->get_inst ( url_info.uuid ); - qlog ("%s VIM CMD: Query Instance - Reporting State\n", url_info.uuid.c_str()); - if ( !instance_ptr ) - { - elog ("%s query instance reporting state (vim) failed - Instance Not Found\n", url_info.uuid.c_str()); - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - } - else - { - string hostname = obj_ptr->get_inst_host_name(url_info.uuid); - response = _update_services_response ( hostname , url_info.uuid, instance_ptr ); - http_status_code = HTTP_OK ; - } - } - /* GET the host level reporting state */ - else if ( url_info.service_level == SERVICE_LEVEL_HOST ) - { - string hostname = obj_ptr->get_host_name(url_info.uuid) ; - qlog ("%s VIM CMD: Query Host - Reporting State\n", hostname.c_str()); - if ( hostname.length() ) - { - - response = ("{"); - response.append ("\"uuid\":\""); - response.append (url_info.uuid); - response.append ("\","); - response.append ("\"hostname\":\""); - response.append (hostname); - response.append ("\","); - response.append ("\"state\":\""); - - if ( obj_ptr->get_reporting_state(hostname) == true ) - response.append ("enabled\"}"); - else - response.append ("disabled\"}"); - - http_status_code = HTTP_OK ; - } - else - { - wlog ("%s query host reporting state (vim) failed - Host Not Found\n", url_info.uuid.c_str()); - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - - /* Ask mtce for an inventory update */ - send_event_to_mtcAgent ( obj_ptr->hostBase.my_hostname, MTC_EVENT_MONITOR_READY ) ; - } - } - else - { - http_status_code = HTTP_NOTFOUND ; - slog ("invalid service level\n"); - } - break ; - } - - case EVHTTP_REQ_PUT: - case EVHTTP_REQ_POST: - case EVHTTP_REQ_PATCH: - { - /* GET the host level reporting state */ - if (( http_cmd == EVHTTP_REQ_POST ) && - ( url_info.service_level == SERVICE_LEVEL_HOST )) - { - string hostname = obj_ptr->get_host_name(url_info.uuid) ; - qlog ("%s VIM CMD: Create Host\n", hostname.c_str()); - if ( hostname.length() ) - { - ilog ("%s create host services (vim)\n", hostname.c_str()); - - http_status_code = HTTP_OK ; - response = " { \"status\" : \"pass\" }" ; - } - else - { - wlog ("%s create host (vim) failed - Host Not Found\n", url_info.uuid.c_str()); - response = _create_error_response ( FAIL_NOT_FOUND ); - http_status_code = HTTP_NOTFOUND ; - - /* Ask mtce for an inventory update */ - send_event_to_mtcAgent ( obj_ptr->hostBase.my_hostname, MTC_EVENT_MONITOR_READY ) ; - } - break ; - } - - /* Otherwise for PUTs and instances ; get the payload */ - struct evbuffer *in_buf = evhttp_request_get_input_buffer ( req ); - if ( in_buf ) - { - size_t len = evbuffer_get_length(in_buf) ; - if ( len ) - { - ev_ssize_t bytes = 0 ; - char * buffer_ptr = (char*)malloc(len+1); - jlog1 ("Buffer @ %p contains %ld bytes\n", &in_buf, len ); - - memset ( buffer_ptr, 0, len+1 ); - bytes = evbuffer_remove(in_buf, buffer_ptr, len ); - - if ( bytes <= 0 ) - { - http_status_code = HTTP_BADREQUEST ; - wlog ("http request with no payload\n"); - } - else - { - http_status_code = HTTP_OK ; - mtc_cmd_enum mtc_cmd; - - jlog("%s\n", buffer_ptr ); - - if (!url_info.command.compare("enable") ) - mtc_cmd = MTC_CMD_ENABLE ; - else if (!url_info.command.compare("disable") ) - mtc_cmd = MTC_CMD_DISABLE ; - else if (!url_info.command.compare("vote") ) - mtc_cmd = MTC_CMD_VOTE ; - else if (!url_info.command.compare("notify") ) - mtc_cmd = MTC_CMD_NOTIFY ; - else - mtc_cmd = MTC_CMD_NOT_SET ; - - if ( url_info.service_level == SERVICE_LEVEL_INST ) - { - response = guestHttpSvr_inst_req ( buffer_ptr, - mtc_cmd, - http_cmd, - http_status_code ); - } - else if ( url_info.service_level == SERVICE_LEVEL_HOST ) - { - response = guestHttpSvr_host_req ( buffer_ptr, - mtc_cmd, - http_cmd, - http_status_code ); - } - else - { - slog ("invalid service level\n"); - } - } - free ( buffer_ptr ); - } - else - { - http_status_code = MTC_HTTP_LENGTH_REQUIRED ; - wlog ("http request has no length\n"); - } - } - else - { - http_status_code = HTTP_BADREQUEST ; - wlog ("Http request has no buffer\n"); - } - break ; - } - default: - { - wlog ("Unknown command (%d)\n", http_cmd ); - http_status_code = HTTP_NOTFOUND ; - } - } - - if (( http_status_code >= HTTP_OK) && (http_status_code <= HTTP_NOCONTENT )) - { - resp_buf = evbuffer_new(); - jlog ("Response: %s\n", response.c_str()); - evbuffer_add_printf (resp_buf, "%s\n", response.data()); - evhttp_send_reply (guest_request.req, http_status_code, "OK", resp_buf ); - evbuffer_free ( resp_buf ); - } - else - { - if ( http_status_code == HTTP_NOTFOUND ) - { - wlog ("%s not found\n", url_ptr ); - } - else - { - elog ("HTTP request error:%d ; cmd:%s url:%s\n", - http_status_code, - getHttpCmdType_str(http_cmd), - url_ptr); - elog ("... response:%s\n", response.c_str()); - } - evhttp_send_error (guest_request.req, http_status_code, response.data() ); - } -} - -/***************************************************************** - * - * Name : guestHttpSvr_bind - * - * Description : Setup the HTTP server socket - * - *****************************************************************/ -int guestHttpSvr_bind ( request_type & request ) -{ - int rc ; - int flags ; - int one = 1; - - request.fd = socket(AF_INET, SOCK_STREAM, 0); - if (request.fd < 0) - { - elog ("HTTP server socket create failed (%d:%m)\n", errno); - return FAIL_SOCKET_CREATE ; - } - - /* make socket reusable */ - rc = setsockopt(request.fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(int)); - - memset(&request.addr, 0, sizeof(struct sockaddr_in)); - request.addr.sin_family = AF_INET; - request.addr.sin_addr.s_addr = inet_addr(LOOPBACK_IP) ; - request.addr.sin_port = htons(request.port); - - /* bind port */ - rc = bind ( request.fd, (struct sockaddr*)&request.addr, sizeof(struct sockaddr_in)); - if (rc < 0) - { - elog ("HTTP bind failure for port %d (%d:%m)\n", request.port, errno ); - return FAIL_SOCKET_BIND ; - } - - /* Listen for requests */ - rc = listen(request.fd, 10 ); - if (rc < 0) - { - elog ("HTTP listen failed (%d:%m)\n", errno ); - return FAIL_SOCKET_LISTEN; - } - - /* make non-blocking */ - flags = fcntl ( request.fd, F_GETFL, 0) ; - if ( flags < 0 || fcntl(request.fd, F_SETFL, flags | O_NONBLOCK) < 0) - { - elog ("HTTP set to non-blocking failed (%d:%m)\n", errno ); - return FAIL_SOCKET_OPTION; - } - - return PASS; -} - -/* Setup the http server */ -int guestHttpSvr_setup ( request_type & request ) -{ - int rc = PASS ; - if ( ( rc = guestHttpSvr_bind ( request )) != PASS ) - { - return rc ; - } - else if (request.fd < 0) - { - wlog ("failed to get http server socket file descriptor\n"); - return RETRY ; - } - - request.base = event_base_new(); - if (request.base == NULL) - { - elog ("failed to get http server request base\n"); - return -1; - } - request.httpd = evhttp_new(request.base); - if (request.httpd == NULL) - { - elog ("failed to get httpd server handle\n"); - return -1; - } - - evhttp_set_allowed_methods (request.httpd, EVENT_METHODS ); - - rc = evhttp_accept_socket(request.httpd, request.fd); - if ( rc == -1) - { - elog ("failed to accept on http server socket\n"); - return -1; - } - evhttp_set_gencb(request.httpd, guestHttpSvr_vimCmdHdlr, NULL); - - return PASS ; -} - -/* initialize the mtce http server */ -int guestHttpSvr_init ( int port ) -{ - int rc = PASS ; - memset ( &guest_request, 0, sizeof(request_type)); - guest_request.port = port ; - - for ( ; ; ) - { - rc = guestHttpSvr_setup ( guest_request ); - if ( rc == RETRY ) - { - wlog ("%s bind failed (%d)\n", GUEST_SERVER, guest_request.fd ); - } - else if ( rc != PASS ) - { - elog ("%s start failed (rc:%d)\n", GUEST_SERVER, rc ); - } - else if ( guest_request.fd > 0 ) - { - ilog ("Listening for 'http command' messages on %s:%d\n", - inet_ntoa(guest_request.addr.sin_addr), guest_request.port ); - rc = PASS ; - break ; - } - if ( rc ) mtcWait_secs (5); - } - return ( rc ) ; -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.h b/mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.h deleted file mode 100644 index 750d3512..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpSvr.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2013, 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Controller Maintenance Daemon - */ - - -typedef struct -{ - struct sockaddr_in addr ; - struct event_base * base ; - struct evhttp_request * req ; - struct evhttp * httpd ; - int fd ; - int port ; -} request_type ; - -void guestHttpSvr_fini ( void ); -int guestHttpSvr_init ( int port ); -int guestHttpSvr_setup ( request_type & request ); -void guestHttpSvr_look ( void ); diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.cpp deleted file mode 100644 index a39ef5b4..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.cpp +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright (c) 2013, 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -/** - * @file - * Wind River CGTS Platform Controller Maintenance HTTP Utilities. - * - * Public Interfaces: - * - */ - -#include -#include -#include - -using namespace std; - -#include "httpUtil.h" /* for ... common http utilities */ -#include "jsonUtil.h" /* for ... Json Utilities */ -#include "nodeUtil.h" /* for ... Node Utilities */ - -#include "guestClass.h" /* for ... maintenance class nodeLinkClass */ -#include "guestHttpUtil.h" /* for ... this module header */ -#include "guestVimApi.h" /* for ... guestVimApi_Handler */ - -/* Module init */ -void guestHttpUtil_init ( void ) -{ - return ; -} - -/* Module close */ -void guestHttpUtil_fini ( void ) -{ - return ; -} - -/* ********************************************************************* - * - * Name : guestHttpUtil_status - * - * Description: Extracts and returns the HTTP execution status - * - * *********************************************************************/ - -int guestHttpUtil_status ( libEvent & event ) -{ - int rc = PASS ; - - if ( !event.req ) - { - elog ("%s Invalid request\n", event.hostname.length() ? event.hostname.c_str() : "unknown" ); - return (FAIL_UNKNOWN_HOSTNAME); - } - event.status = event.http_status = evhttp_request_get_response_code (event.req); - switch (event.status) - { - case HTTP_OK: - case 201: - case 202: - case 203: - case 204: - { - dlog ("%s HTTP_OK (%d)\n", event.hostname.c_str(), event.status ); - event.status = PASS ; - break; - } - /* Authentication error - refresh the token */ - case 401: - { - rc = FAIL_AUTHENTICATION ; - break ; - } - case 0: - { - wlog ("%s Status:0 - failed to connect to '%s:%d'\n", - event.hostname.c_str(), event.ip.c_str(), event.port); - event.status = FAIL_HTTP_ZERO_STATUS ; - rc = FAIL_HTTP_ZERO_STATUS ; - break ; - } - default: - { - dlog3 ("%s Status: %d\n", event.hostname.c_str(), event.status ); - rc = event.status ; - break; - } - } - return (rc); -} - -/* *********************************************************************** - * - * Name : guestHttpUtil_api_req - * - * Description: Makes an HTTP request based on all the info - * in the supplied libEvent. - * - * ************************************************************************/ -int guestHttpUtil_api_req ( libEvent & event ) - -{ - http_headers_type hdrs ; - bool has_payload = false; - int hdr_entry = 0 ; - int rc = FAIL ; - void(*handler)(struct evhttp_request *, void *) = NULL ; - - /* Bind the unlock handler */ - handler = &guestVimApi_Handler; - - /* set the timeout */ - event.timeout = HTTP_VIM_TIMEOUT ; - - /* Check for memory leaks */ - if ( event.base ) - { - slog ("%s http base memory leak avoidance (%p) fixme !!\n", - event.log_prefix.c_str(), event.base ); - // event_base_free(event.base); - } - - /* Allocate the base */ - event.base = event_base_new(); - if ( event.base == NULL ) - { - elog ("%s No Memory for Request\n", event.log_prefix.c_str()); - return ( FAIL_EVENT_BASE ); - } - - /* Establish connection */ - else if ( httpUtil_connect ( event )) - { - return (FAIL_CONNECT); - } - - else if ( httpUtil_request ( event, handler )) - { - return (FAIL_REQUEST_NEW); - } - - jlog ("%s Address : %s\n", event.hostname.c_str(), event.token.url.c_str()); - - if ((( event.type != EVHTTP_REQ_GET ) && ( event.type != EVHTTP_REQ_DELETE )) || - ( event.request == VIM_HOST_STATE_QUERY )) - { - has_payload = true ; - - /* Add payload to the output buffer but only for PUT, POST and PATCH requests */ - if ( httpUtil_payload_add ( event )) - { - return (FAIL_PAYLOAD_ADD); - } - jlog ("%s Payload : %s\n", event.hostname.c_str(), - event.payload.c_str() ); - } - - /* Convert port to a string */ - char port_str[10] ; - sprintf ( port_str, "%d", event.port ); - - /* Build the HTTP Header */ - hdrs.entry[hdr_entry].key = "Host" ; - hdrs.entry[hdr_entry].value = event.ip ; - hdrs.entry[hdr_entry].value.append(":") ; - hdrs.entry[hdr_entry].value.append(port_str); - hdr_entry++; - - if ( has_payload == true ) - { - hdrs.entry[hdr_entry].key = "Content-Length" ; - hdrs.entry[hdr_entry].value = httpUtil_payload_len ( &event ); - hdr_entry++; - } - - hdrs.entry[hdr_entry].key = "User-Agent" ; - hdrs.entry[hdr_entry].value = "guest-agent/1.0" ; - hdr_entry++; - - hdrs.entry[hdr_entry].key = "Content-Type" ; - hdrs.entry[hdr_entry].value = "application/json" ; - hdr_entry++; - - hdrs.entry[hdr_entry].key = "Connection" ; - hdrs.entry[hdr_entry].value = "close" ; - hdr_entry++; - hdrs.entries = hdr_entry ; - - /* Add the headers */ - if ( httpUtil_header_add ( &event, &hdrs )) - { - return (FAIL_HEADER_ADD); - } - - event.address = event.token.url ; - - rc = evhttp_make_request ( event.conn, event.req, event.type, event.token.url.data()); - if ( rc == PASS ) - { - evhttp_connection_set_timeout(event.req->evcon, event.timeout); - - /* Default to retry for both blocking and non-blocking command */ - event.status = RETRY ; - event.log_prefix = event.hostname ; - event.log_prefix.append (" "); - event.log_prefix.append (event.service) ; - event.log_prefix.append (" "); - event.log_prefix.append (event.operation) ; - jlog2 ("%s Requested (blocking) (to:%d)\n", event.log_prefix.c_str(), event.timeout); - - /* Send the message with timeout */ - event_base_dispatch(event.base); - - httpUtil_free_conn ( event ); - httpUtil_free_base ( event ); - - return(event.status) ; - } - elog ("%s Call to 'evhttp_make_request' failed (rc:%d)\n", - event.hostname.c_str(), rc); - - return (FAIL_MAKE_REQUEST); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.h b/mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.h deleted file mode 100644 index 9e622e96..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestHttpUtil.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __INCLUDE_GUESTHTTPUTIL_H__ -#define __INCLUDE_GUESTHTTPUTIL_H__ -/* - * Copyright (c) 2013, 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Controller Maintenance ... - * - * libevent HTTP support utilities and control structure support header - */ - -#include /* for ... string */ -#include /* for ... http libevent client */ - -using namespace std; - -#include "guestClass.h" /* for ... maintenance class nodeLinkClass */ -#include "httpUtil.h" /* for ... common http utilities */ - -/***********************************************************************/ - -void guestHttpUtil_init ( void ); -void guestHttpUtil_fini ( void ); -int guestHttpUtil_status ( libEvent & event ); -int guestHttpUtil_api_req ( libEvent & event ); - -#endif /* __INCLUDE_GUESTHTTPUTIL_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.cpp deleted file mode 100644 index bffae409..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.cpp +++ /dev/null @@ -1,764 +0,0 @@ -/* - * Copyright (c) 2013-2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Services "Instances Base Class" - */ - - -#include -#include -#include -#include -#include -#include - -using namespace std; - -#include "nodeBase.h" /* for ... common definitions */ -#include "nodeEvent.h" /* for ... set_inotify_watch_file */ -#include "nodeTimers.h" /* for ... mtcTimer */ -#include "guestBase.h" /* for ... instInfo */ -#include "guestUtil.h" /* for ... guestUtil_inst_init */ -#include "guestInstClass.h" /* for ... get_inst */ -#include "guestSvrUtil.h" /* for ... hb_get_state_name */ - -/**< constructor */ -guestInstClass::guestInstClass() -{ - inst_head = NULL ; - inst_tail = NULL ; - - memory_allocs = 0 ; - memory_used = 0 ; - instances = 0 ; - - for ( int i = 0 ; i < MAX_INSTANCES ; i++ ) - { - inst_ptrs[i] = NULL ; - } - - fsm_exit = false ; - reporting = true ; - return ; -} - -/**< destructor */ -guestInstClass::~guestInstClass() -{ - inst * inst_ptr = inst_head ; - inst * temp_ptr = inst_ptr ; - while ( inst_ptr != NULL ) - { - temp_ptr = inst_ptr ; - inst_ptr = inst_ptr->next ; - delInst (temp_ptr); - } - if ( memory_used != 0 ) - { - elog ( "Apparent Memory Leak - Allocs:%d and Bytes:%d\n", - memory_allocs, memory_used ); - } - else - { - dlog ( "No Memory Leaks\n\n"); - } - return ; -} - -void guestInstClass::guest_fsm_run ( void ) -{ - fsm_run (); -} - -/* - * Allocate new instance and tack it on the end of the instance list - */ -struct guestInstClass::inst* guestInstClass::addInst ( string uuid ) -{ - if ( uuid.length() != UUID_LEN ) - { - elog ("invalid instance uuid ; cannot add %s\n", uuid.c_str()); - return static_cast(NULL); - } - - /* verify instance is not already provisioned */ - struct inst * inst_ptr = guestInstClass::getInst ( uuid ); - if ( inst_ptr ) - { - if ( guestInstClass::remInst ( uuid ) ) - { - /* Should never get here but if we do then */ - /* something is seriously wrong */ - elog ("%s unable to remove instance during reprovision\n", - log_prefix(&inst_ptr->instance).c_str()); - return static_cast(NULL); - } - } - - /* allocate memory for new instance */ - inst_ptr = guestInstClass::newInst (); - if( inst_ptr == NULL ) - { - elog ( "failed to allocate memory for new instance\n" ); - return static_cast(NULL); - } - - guestUtil_inst_init ( &inst_ptr->instance ); - - /* Init the new instance */ - inst_ptr->instance.uuid = uuid ; - inst_ptr->query_flag = false ; - inst_ptr->instance.connect_wait_in_secs = DEFAULT_CONNECT_WAIT ; - - /* Init instance's connect and monitor timers */ - /* Assign the timer the instance's name */ - mtcTimer_init ( inst_ptr->reconnect_timer, uuid ); - mtcTimer_init ( inst_ptr->connect_timer, uuid ); - mtcTimer_init ( inst_ptr->monitor_timer, uuid ); - mtcTimer_init ( inst_ptr->init_timer, uuid ); - mtcTimer_init ( inst_ptr->vote_timer, uuid ); - - inst_ptr->action = FSM_ACTION__NONE ; - - inst_ptr->connectStage = INST_CONNECT__START ; - inst_ptr->monitorStage = INST_MONITOR__STEADY ; - inst_ptr->messageStage = INST_MESSAGE__RECEIVE ; - - /* If the instance list is empty add it to the head */ - if( inst_head == NULL ) - { - inst_head = inst_ptr ; - inst_tail = inst_ptr ; - inst_ptr->prev = NULL ; - inst_ptr->next = NULL ; - } - else - { - /* link the new_instance to the tail of the inst_list - * then mark the next field as the end of the inst_list - * adjust tail to point to the last instance - */ - inst_tail->next = inst_ptr ; - inst_ptr->prev = inst_tail ; - inst_ptr->next = NULL ; - inst_tail = inst_ptr ; - } - - instances++ ; - ilog ("%s added as instance %d\n", log_prefix(&inst_ptr->instance).c_str(), instances); - return inst_ptr ; -} - -/* Remove an instance from the linked list of instances - may require splice action */ -int guestInstClass::remInst( string uuid ) -{ - if ( uuid.empty() ) - return -ENODEV ; - - if ( inst_head == NULL ) - return -ENXIO ; - - struct inst * inst_ptr = getInst ( uuid ); - - if ( inst_ptr == NULL ) - return -EFAULT ; - - stop_instance_timers ( inst_ptr ); - - /* Close the channel if it is open */ - guestUtil_close_channel ( &inst_ptr->instance ); - - /* If the instance is the head instance */ - if ( inst_ptr == inst_head ) - { - /* only one instance in the list case */ - if ( inst_head == inst_tail ) - { - dlog2 ("Single Inst -> Head Case\n"); - inst_head = NULL ; - inst_tail = NULL ; - } - else - { - dlog2 ("Multiple Insts -> Head Case\n"); - inst_head = inst_head->next ; - inst_head->prev = NULL ; - } - } - /* if not head but tail then there must be more than one - * instance in the list so go ahead and chop the tail. - */ - else if ( inst_ptr == inst_tail ) - { - dlog2 ("Multiple Inst -> Tail Case\n"); - inst_tail = inst_tail->prev ; - inst_tail->next = NULL ; - } - else - { - dlog2 ("Multiple Inst -> Full Splice Out\n"); - inst_ptr->prev->next = inst_ptr->next ; - inst_ptr->next->prev = inst_ptr->prev ; - } - delInst ( inst_ptr ); - instances-- ; - - if ( instances == 0 ) - ilog ("no instances to monitor\n"); - - return (PASS) ; -} - -/* Perform a linked list search for the instance matching the instance name */ -struct guestInstClass::inst* guestInstClass::getInst ( string chan_or_uuid ) -{ - struct inst * inst_ptr = static_cast(NULL) ; - - /* check for empty list condition */ - if ( inst_head ) - { - for ( inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - if ( !inst_ptr->instance.uuid.compare (chan_or_uuid) ) - { - return inst_ptr ; - } - if ( !inst_ptr->instance.chan.compare (chan_or_uuid) ) - { - return inst_ptr ; - } - - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - } - return static_cast(NULL); -} - -/* - * Allocates memory for a new instance and stores its address in inst_ptrs - * - * @param void - * @return pointer to the newly allocted instance memory - */ -struct guestInstClass::inst * guestInstClass::newInst ( void ) -{ - struct guestInstClass::inst * temp_inst_ptr = NULL ; - - if ( memory_allocs == 0 ) - { - memset ( inst_ptrs, 0 , sizeof(struct inst *)*MAX_INSTANCES); - } - - // find an empty spot - for ( int i = 0 ; i < MAX_INSTANCES ; i++ ) - { - if ( inst_ptrs[i] == NULL ) - { - inst_ptrs[i] = temp_inst_ptr = new inst ; - memory_allocs++ ; - memory_used += sizeof (struct guestInstClass::inst); - - return temp_inst_ptr ; - } - } - elog ( "failed to store new instance pointer address\n" ); - return temp_inst_ptr ; -} - -/* Frees the memory of a pre-allocated instance and removes - * it from the inst_ptrs list. - * - * @param instance * pointer to the instance memory address to be freed - * @return int return code { PASS or -EINVAL } - */ -int guestInstClass::delInst ( struct guestInstClass::inst * inst_ptr ) -{ - if ( memory_allocs > 0 ) - { - for ( int i = 0 ; i < MAX_INSTANCES ; i++ ) - { - if ( inst_ptrs[i] == inst_ptr ) - { - delete inst_ptr ; - inst_ptrs[i] = NULL ; - memory_allocs-- ; - memory_used -= sizeof (struct guestInstClass::inst); - return PASS ; - } - } - elog ( "unable to validate memory address being freed\n" ); - } - else - elog ( "free memory called when there is no memory to free\n" ); - - return -EINVAL ; -} - -/*************************************************************************************** - * P U B L I C I N T E R F A C E S - **************************************************************************************/ - -/* Add an instance based on its uuid. - * If the instance already exists then update its info */ -int guestInstClass::add_inst ( string uuid , instInfo & instance ) -{ - int rc = FAIL ; - - struct guestInstClass::inst * inst_ptr = getInst(uuid); - if ( inst_ptr ) - { - ilog ("********************************************************\n"); - ilog ("%s Already provisioned - TODO: Create copy constructor \n", uuid.c_str()); - ilog ("********************************************************\n"); - - /* Send back a retry in case the add needs to be converted to a modify */ - rc = PASS ; - } - /* Otherwise add it as a new instance */ - else - { - if ( uuid.length() != UUID_LEN ) - { - elog ("invalid uuid %s\n", uuid.c_str()); - return (FAIL_INVALID_UUID); - } - - inst_ptr = guestInstClass::addInst(uuid); - if ( inst_ptr ) - { - rc = PASS ; - } - else - { - elog ("failed to add instance '%s'\n", uuid.c_str()); - rc = FAIL_NULL_POINTER ; - } - } - - if ( rc == PASS ) - { - inst_ptr->heartbeat_count = 0 ; - - inst_ptr->mismatch_count = 0 ; - - /* TODO: This needs to be a complete copy - Need copy constructor */ - inst_ptr->instance.heartbeat.failures = 0 ; - inst_ptr->instance.heartbeat.failed = false ; - inst_ptr->instance.heartbeat.reporting = instance.heartbeat.reporting ; - inst_ptr->instance.heartbeat.provisioned = instance.heartbeat.provisioned ; - inst_ptr->instance.heartbeat.state = instance.heartbeat.state ; - inst_ptr->instance.hbState = hbs_server_waiting_init ; - inst_ptr->instance.vnState = hbs_server_waiting_init ; - - inst_ptr->instance.name_log_prefix = "" ; - inst_ptr->instance.uuid_log_prefix = "" ; - - inst_ptr->instance.name = instance.name ; - inst_ptr->instance.inst = instance.inst ; - inst_ptr->instance.connected = instance.connected ; - inst_ptr->instance.heartbeating = instance.heartbeating ; - inst_ptr->instance.chan_fd = instance.chan_fd ; - inst_ptr->instance.chan_ok = instance.chan_ok ; - - inst_ptr->instance.corrective_action = instance.corrective_action ; - inst_ptr->instance.heartbeat_interval_ms = instance.heartbeat_interval_ms ; - - inst_ptr->instance.vote_secs = instance.vote_secs ; - inst_ptr->instance.shutdown_notice_secs = instance.shutdown_notice_secs ; - inst_ptr->instance.suspend_notice_secs = instance.suspend_notice_secs ; - inst_ptr->instance.resume_notice_secs = instance.resume_notice_secs ; - inst_ptr->instance.restart_secs = instance.restart_secs ; - - /* Update the channel */ - if ( instance.chan.length() > UUID_LEN ) - inst_ptr->instance.chan = instance.chan ; - } - return (rc); -} - -/***************************************************************************** - * - * Name : del_inst - * - * Purpose : Delete an instance from the linked list - * - *****************************************************************************/ -int guestInstClass::del_inst ( string uuid ) -{ - int rc = FAIL ; - if ( ! uuid.empty() ) - { - /* free memory */ - rc = remInst ( uuid ); - } - return ( rc ); -} - -/***************************************************************************** - * - * Name : qry_inst - * - * Purpose : Send instance info to the guestAgent - * - *****************************************************************************/ -int guestInstClass::qry_inst ( ) -{ - return ( guestAgent_qry_handler ()); -} - -void guestInstClass::stop_instance_timers ( struct guestInstClass::inst * inst_ptr ) -{ - /* Free the mtc timer if in use */ - if ( inst_ptr->reconnect_timer.tid ) - { - mtcTimer_stop ( inst_ptr->reconnect_timer ); - inst_ptr->reconnect_timer.ring = false ; - inst_ptr->reconnect_timer.tid = NULL ; - } - /* Free the connect timer if in use */ - if ( inst_ptr->connect_timer.tid ) - { - mtcTimer_stop ( inst_ptr->connect_timer ); - inst_ptr->connect_timer.ring = false ; - inst_ptr->connect_timer.tid = NULL ; - } - /* Free the monitor timer if in use */ - if ( inst_ptr->monitor_timer.tid ) - { - mtcTimer_stop ( inst_ptr->monitor_timer ); - inst_ptr->monitor_timer.ring = false ; - inst_ptr->monitor_timer.tid = NULL ; - } - /* Free the init timer if in use */ - if ( inst_ptr->init_timer.tid ) - { - mtcTimer_stop ( inst_ptr->init_timer ); - inst_ptr->init_timer.ring = false ; - inst_ptr->init_timer.tid = NULL ; - } - /* Free the vote timer if in use */ - if ( inst_ptr->vote_timer.tid ) - { - mtcTimer_stop ( inst_ptr->vote_timer ); - inst_ptr->vote_timer.ring = false ; - inst_ptr->vote_timer.tid = NULL ; - } -} - - -void guestInstClass::free_instance_resources ( void ) -{ - /* check for empty list condition */ - if ( inst_head ) - { - for ( struct inst * inst_ptr = inst_head ; ; inst_ptr = inst_ptr->next ) - { - if ( inst_ptr->instance.chan_fd ) - { - ilog ("%s closing fd %d for uuid %s\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.chan_fd, - inst_ptr->instance.uuid.c_str()); - - close ( inst_ptr->instance.chan_fd ); - } - stop_instance_timers ( inst_ptr ); - - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - } -} - - -/****************************************************************************/ -/** FSM Control Utilities */ -/****************************************************************************/ - -void guestInstClass::reconnect_start ( const char * uuid_ptr ) -{ - string uuid = uuid_ptr ; - if ( uuid.length() != UUID_LEN ) - { - elog ("invalid uuid %s (uuid:%ld)\n", uuid.c_str(), uuid.length()); - return ; - } - - struct guestInstClass::inst * inst_ptr = guestInstClass::getInst(uuid); - if ( inst_ptr ) - { - guestUtil_close_channel ( &inst_ptr->instance ); - } - else - { - inst_ptr = guestInstClass::addInst(uuid); - } - - if ( inst_ptr ) - { - instInfo * instInfo_ptr = &inst_ptr->instance ; - if ( instInfo_ptr->fd_namespace.size() ) - { - /* Setup inotify to watch for new instance serial IO channel creations */ - if ( set_inotify_watch_file ( instInfo_ptr->fd_namespace.data(), - instInfo_ptr->inotify_file_fd, - instInfo_ptr->inotify_file_wd)) - { - elog ("%s failed to setup 'inotify' on %s\n", - log_prefix(instInfo_ptr).c_str(), - instInfo_ptr->fd_namespace.c_str()); - } - } - ilog ("%s reconnecting ... %s\n", log_prefix(instInfo_ptr).c_str(), - instInfo_ptr->connected ? " CONNECTED" : "" ); - - if ( inst_ptr->connect_timer.tid ) - mtcTimer_stop ( inst_ptr->connect_timer ); - - inst_ptr->action = FSM_ACTION__CONNECT ; - inst_ptr->connectStage = INST_CONNECT__START ; - - // mtcTimer_start ( inst_ptr->connect_timer, guestTimer_handler, inst_ptr->instance.connect_wait_in_secs ); - - //ilog ("%s connect attempt in %d seconds\n", - // log_prefix(&inst_ptr->instance).c_str(), inst_ptr->instance.connect_wait_in_secs); - instInfo_ptr->connecting = true ; - } - else - { - elog ("%s failed to find or add instance\n", uuid.c_str() ); - } -} - - - -/****************************************************************************/ -/** Inst Class Setter / Getters */ -/****************************************************************************/ - -/***************************************************************************** - * - * Name : get_inst - * - * Purpose : Return a pointer to the instance for a specified uuid - * - *****************************************************************************/ -instInfo * guestInstClass::get_inst ( string uuid ) -{ - struct guestInstClass::inst * inst_ptr = guestInstClass::getInst(uuid); - if ( inst_ptr ) - { - return (&inst_ptr->instance ); - } - return static_cast(NULL); -} - -/***************************************************************************** - * - * Name : getInst_timer - * - * Purpose : Return a pointer to the instance that contains the timer for - * the specified timer ID. - * - *****************************************************************************/ -struct guestInstClass::inst * guestInstClass::getInst_timer ( timer_t tid, int timer_id ) -{ - if ( tid != NULL ) - { - if ( inst_head ) - { - struct inst * inst_ptr ; - for ( inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - if (( timer_id == INST_TIMER_MONITOR ) && (inst_ptr->monitor_timer.tid == tid )) - { - return inst_ptr ; - } - else if (( timer_id == INST_TIMER_CONNECT ) && (inst_ptr->connect_timer.tid == tid )) - { - return inst_ptr ; - } - else if (( timer_id == INST_TIMER_VOTE ) && ( inst_ptr->vote_timer.tid == tid )) - { - return inst_ptr ; - } - else if (( timer_id == INST_TIMER_INIT ) && ( inst_ptr->init_timer.tid == tid )) - { - return inst_ptr ; - } - else if (( timer_id == INST_TIMER_RECONNECT ) && ( inst_ptr->reconnect_timer.tid == tid )) - { - return inst_ptr ; - } - - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - } - } - return static_cast(NULL); -} - -/* Get an instance's heartbeat fault reporting state */ -bool guestInstClass::get_reporting_state ( string uuid ) -{ - guestInstClass::inst * inst_ptr = guestInstClass::getInst ( uuid ); - if ( inst_ptr ) - { - return ( inst_ptr->instance.heartbeat.reporting ); - } - else - { - wlog ("uuid not found '%s'\n", uuid.c_str()); - } - return ( false ); -} - -/* Set an instances heartbeat fault reporting state */ -int guestInstClass::set_reporting_state( string uuid, bool reporting ) -{ - guestInstClass::inst * inst_ptr = guestInstClass::getInst ( uuid ); - if ( inst_ptr ) - { - inst_ptr->instance.heartbeat.reporting = reporting ; - } - else - { - wlog ("uuid not found '%s'\n", uuid.c_str()); - return (FAIL_NOT_FOUND) ; - } - return (PASS); -} - - -/***************************************************************************** - * - * Name : print_all_instances - * - * Purpose: Print a summary of the instances that are currently provisioned - * - *****************************************************************************/ -void guestInstClass::print_all_instances ( void ) -{ - bool found = false; - int i = 0 ; - if ( inst_head ) - { - struct inst * inst_ptr ; - for ( inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - ilog ("%2d %s Heartbeat: Notify:%c Failures:%d\n", i, - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.heartbeat.reporting ? 'Y':'n', - inst_ptr->instance.heartbeat.failures); - found = true ; - i++ ; - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - } - - if ( found == false ) - { - ilog ("no instances provisioned\n"); - } -} - -/***************************************************************************** - * - * Name : print_instances (private) - * - *****************************************************************************/ -void guestInstClass::print_instances ( void ) -{ - print_all_instances(); -} - -/***************************************************************************** - * Memory Dump Stuff * - *****************************************************************************/ -void guestInstClass::print_node_info ( void ) -{ - fflush (stdout); - fflush (stderr); -} - -void guestInstClass::mem_log_info ( void ) -{ - char str[MAX_MEM_LOG_DATA] ; - snprintf (&str[0], MAX_MEM_LOG_DATA, "Instances:%d Allocs:%d Memory:%d\n", instances, memory_allocs, memory_used ); - mem_log (str); -} - -void mem_log_delimit_host ( void ) -{ - char str[MAX_MEM_LOG_DATA] ; - snprintf (&str[0], MAX_MEM_LOG_DATA, "-------------------------------------------------------------\n"); - mem_log (str); -} - -void guestInstClass::mem_log_inst_info ( void ) -{ - char str[MAX_MEM_LOG_DATA] ; - - struct inst * inst_ptr = static_cast(NULL) ; - - for ( inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - snprintf (&str[0], MAX_MEM_LOG_DATA, "Name : %s %s (%s)\n", - inst_ptr->instance.name.data(), - inst_ptr->instance.uuid.data(), - inst_ptr->instance.inst.data()); - mem_log (str); - - snprintf (&str[0], MAX_MEM_LOG_DATA, "Action: %8d Connect:%2d Message:%2d Delay:%d secs\n", - inst_ptr->action, - inst_ptr->connectStage, - inst_ptr->messageStage, - inst_ptr->instance.connect_wait_in_secs); - mem_log (str); - - snprintf (&str[0], MAX_MEM_LOG_DATA, "State : Reporting: %c Failures: %d Failed: %c\n", - inst_ptr->instance.heartbeat.reporting ? 'Y' : 'n', - inst_ptr->instance.heartbeat.failures, - inst_ptr->instance.heartbeat.failed ? 'Y' : 'n' ); - mem_log (str); - - snprintf (&str[0], MAX_MEM_LOG_DATA, "Setup : Select :%2d Channel OK: %c hbState:%s vnState:%s\n", - inst_ptr->instance.chan_fd, - inst_ptr->instance.chan_ok ? 'Y' : 'n' , - hb_get_state_name(inst_ptr->instance.hbState), - hb_get_state_name(inst_ptr->instance.vnState)); - mem_log (str); - - snprintf (&str[0], MAX_MEM_LOG_DATA, "Oper : Connected: %c Heartbeating: %c\n", - inst_ptr->instance.connected ? 'Y' : 'n', - inst_ptr->instance.heartbeating ? 'Y' : 'n'); - mem_log (str); - - mem_log_delimit_host(); - - /* exit if this happens to be the last one in the list */ - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - if ( inst_head == NULL ) - { - snprintf (&str[0], MAX_MEM_LOG_DATA, "no instances\n"); - mem_log (str); - } -} - -void guestInstClass::memDumpAllState ( void ) -{ - mem_log_info ( ); - mem_log_delimit_host (); - mem_log_inst_info (); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.h b/mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.h deleted file mode 100644 index 6b601e07..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestInstClass.h +++ /dev/null @@ -1,230 +0,0 @@ -#ifndef __INCLUDE_INSTBASECLASS_H__ -#define __INCLUDE_INSTBASECLASS_H__ - -/* - * Copyright (c) 2013-2018 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Services "Instances Base Class Header" - */ - -#include -#include "guestBase.h" /* for ... instInfo */ - -typedef enum -{ - FSM_ACTION__NONE, - FSM_ACTION__CONNECT, - FSM_ACTION__LAST - -} guest_fsmActions_enum ; - -typedef enum -{ - INST_CONNECT__START = 1, - INST_CONNECT__WAIT = 2, - INST_CONNECT__RETRY = 3, - INST_CONNECT__DONE = 4, - INST_CONNECT__STAGES = 5 -} guest_connectStages_enum ; - -typedef enum -{ - INST_MONITOR__STEADY = 0, - INST_MONITOR__DELAY = 2, - INST_MONITOR__FAILURE = 1, -} guest_monitorStages_enum ; - - -typedef enum -{ - INST_MESSAGE__RECEIVE = 0, - INST_MESSAGE__SEND_INIT_ACK = 1, - INST_MESSAGE__RESP_WAIT = 2, /* Waiting for heartbeat challenge response */ - INST_MESSAGE__SEND_WAIT = 3, /* Waiting for period to expire for challenge resend */ - INST_MESSAGE__TRANSMIT = 4, - INST_MESSAGE__STALL = 5 -} guest_messageStages_enum ; - -class guestInstClass -{ - private: - struct inst { - - /** Pointer to the previous / next host in the list */ - struct inst * prev; - struct inst * next; - - /* Instance info */ - instInfo instance ; - - /** - * Top level gate for the host. - * If false then reporting for all instances are off. - */ - // bool reporting; - - bool query_flag ; - - #define INST_TIMER_MONITOR (0) - #define INST_TIMER_CONNECT (1) - #define INST_TIMER_RECONNECT (2) - #define INST_TIMER_INIT (3) - #define INST_TIMER_VOTE (4) - #define INST_TIMER_MAX (5) - - // number of continuous reads for an instance to deal with - // potential message burst - #define INST_MSG_READ_COUNT 5 - - /** General Purpose instance timer */ - // struct mtc_timer timer; - struct mtc_timer vote_timer; - struct mtc_timer init_timer; - struct mtc_timer monitor_timer; - struct mtc_timer connect_timer; - struct mtc_timer reconnect_timer; - - - guest_connectStages_enum connectStage ; - guest_messageStages_enum messageStage ; - guest_monitorStages_enum monitorStage ; - - guest_fsmActions_enum action ; - - int monitor_handler_count ; - int message_handler_count ; - int connect_handler_count ; - int mismatch_count ; - int heartbeat_count ; - - /* Message list for this instance*/ - list message_list ; - }; - - struct inst * inst_head ; /**< Inst Linked List Head pointer */ - struct inst * inst_tail ; /**< Inst Linked List Tail pointer */ - - /** List of allocated host memory. - * - * An array of host pointers. - */ - inst * inst_ptrs[MAX_HOSTS] ; - - /** A memory allocation counter. - * - * Should represent the number of hosts in the linked list. - */ - int memory_allocs ; - - /** A memory used counter - * - * A variable storing the accumulated instance memory - */ - int memory_used ; - - bool fsm_exit ; - void fsm_run ( void ); - - struct guestInstClass::inst* newInst ( void ); - struct guestInstClass::inst* addInst ( string uuid ); - struct guestInstClass::inst* getInst ( string uuid ); - int remInst ( string uuid ); - int delInst ( struct guestInstClass::inst * inst_ptr ); - void readInst ( void ); - - void print_all_instances ( void ); - - void mem_log_inst_info ( void ); - - struct guestInstClass::inst* getInst_timer ( timer_t tid, int timer_id ); - - int message_handler ( struct guestInstClass::inst * inst_ptr ); - int connect_handler ( struct guestInstClass::inst * inst_ptr ); - int monitor_handler ( struct guestInstClass::inst * inst_ptr ); - - void start_monitor_timer ( struct guestInstClass::inst * inst_ptr ); - - /** Thus member function loops over all the insances and sends - * a json string instances: [uuid:state],[uuid:state]... - * back to the guestAgent. */ - int guestAgent_qry_handler ( void ); - - int send_challenge ( struct guestInstClass::inst * inst_ptr ); - - void manage_comm_loss ( void ); - - void mem_log_info ( void ); - void process_msg(json_object *jobj_msg, struct guestInstClass::inst * inst_ptr); - void parser(char *buf, ssize_t len, json_tokener* tok, int newline_found, struct guestInstClass::inst * inst_ptr); - void handle_virtio_serial_msg(char *buf, ssize_t len, json_tokener* tok, struct guestInstClass::inst * inst_ptr); - - public: - - guestInstClass(); /**< constructor */ - ~guestInstClass(); /**< destructor */ - - bool reporting ; - void print_instances ( void ); - - /** handle an expired timer */ - void timer_handler ( int sig, siginfo_t *si, void *uc); - - struct mtc_timer search_timer; - - int instances ; - void guest_fsm_run ( void ); - - int qry_inst ( void ); - int add_inst ( string uuid, instInfo & instance ); - int mod_inst ( string uuid, instInfo & instance ); - int del_inst ( string uuid ); - instInfo * get_inst ( string uuid ); - - ssize_t write_inst ( instInfo * ptr, const char *message, size_t size); - - void reconnect_start ( const char * uuid_ptr ) ; // string uuid ); - - void set_query_flag ( string uuid ); - bool get_query_flag ( string uuid ); - bool get_reporting_state( string uuid ); - int set_reporting_state( string uuid, bool enabled ); - - int send_vote_notify ( string uuid ); - int send_vote_notify_resp ( char * hostname, string uuid, - string notification_type, - string event_type, - string vote_result, - string reject_reason); - - void send_client_msg_nack ( instInfo * instInfo_ptr, - string log_err); - void handle_parse_failure ( struct guestInstClass::inst * inst_ptr, - const char *key, - struct json_object *jobj_msg); - - /* Called on controlle daemon exit */ - void free_instance_resources ( void ); - void stop_instance_timers ( struct guestInstClass::inst * inst_ptr ); - - /* For select dispatch */ - struct timeval waitd ; - - fd_set inotify_readfds ; - fd_set instance_readfds ; - fd_set message_readfds ; - - void memLogDelimit ( void ); /**< Debug log delimiter */ - void memDumpNodeState ( string uuid ); - void memDumpAllState ( void ); - void print_node_info ( void ); /**< Print node info banner */ -}; - -guestInstClass * get_instInv_ptr ( void ); - -#endif /* __INCLUDE_INSTBASECLASS_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestServer.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestServer.cpp deleted file mode 100644 index 60903524..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestServer.cpp +++ /dev/null @@ -1,580 +0,0 @@ -/* - * Copyright (c) 2013, 2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Heartbeat Server Daemon on Compute - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for hostent */ -#include -#include -#include -#include -#include -#include /* for close and usleep */ -#include /* for realtime scheduling api */ - -using namespace std; - -#include "nodeBase.h" -#include "daemon_ini.h" /* Ini Parser Header */ -#include "daemon_common.h" /* Common definitions and types for daemons */ -#include "daemon_option.h" /* Common options for daemons */ -#include "nodeUtil.h" /* for ... common utilities */ -#include "jsonUtil.h" /* for ... jason utilities */ -#include "nodeTimers.h" /* for ... maintenance timers */ -#include "nodeMacro.h" /* for ... CREATE_NONBLOCK_INET_UDP_RX_SOCKET */ -#include "nodeEvent.h" /* for ... set_inotify_watch, set_inotify_close */ -#include "guestBase.h" -#include "guestUtil.h" /* for ... guestUtil_inst_init */ -#include "guestSvrUtil.h" /* for ... guestUtil_inotify_events */ -#include "guestVirtio.h" /* for ... virtio_channel_connect */ -#include "guestSvrMsg.h" /* for ... send_to_guestAgent */ -#include "guestInstClass.h" - -/* Where to send events */ -string guestAgent_ip = "" ; - -/***************************************************************************** - * - * The daemon primary instance racking object. - * - * This object is a dynamically managed linked list of tracked insances - * - * @see guestInstClass Module control structure in guestInstClass.h - * - *****************************************************************************/ -guestInstClass instInv ; -guestInstClass * get_instInv_ptr ( void ) { return(&instInv); } - - -/* @see guestBase.h Module control structure - * TODO: Consider obsoleting by moving into class */ -ctrl_type ctrl ; -ctrl_type * get_ctrl_ptr ( void ) -{ - return(&ctrl); -} - -void daemon_sigchld_hdlr ( void ) -{ - ; /* dlog("Received SIGCHLD ... no action\n"); */ -} - -/** - * Daemon Configuration Structure - The allocated struct - * @see daemon_common.h for daemon_config_type struct format. - */ -static daemon_config_type guest_config ; -daemon_config_type * daemon_get_cfg_ptr () { return &guest_config ; } - -/* Cleanup exit handler */ -void daemon_exit ( void ) -{ - daemon_dump_info (); - daemon_files_fini (); - - /* Close the messaging sockets */ - if ( ctrl.sock.server_rx_sock ) - delete (ctrl.sock.server_rx_sock); - - if ( ctrl.sock.server_tx_sock ) - delete (ctrl.sock.server_tx_sock); - - if ( ctrl.sock.agent_rx_float_sock ) - delete (ctrl.sock.agent_rx_float_sock); - - if ( ctrl.sock.agent_tx_sock ) - delete (ctrl.sock.agent_tx_sock); - - /* Turn off inotify */ - set_inotify_close ( ctrl.inotify_dir_fd, ctrl.inotify_dir_wd ); - - instInv.free_instance_resources (); - - fflush (stdout); - fflush (stderr); - - exit (0); -} - -/** Client Config mask */ -#define CONFIG_MASK (CONFIG_CLIENT_RX_PORT |\ - CONFIG_AGENT_RX_PORT) - -/* Startup config read */ -static int _config_handler ( void * user, - const char * section, - const char * name, - const char * value) -{ - daemon_config_type* config_ptr = (daemon_config_type*)user; - - if (MATCH("agent", "rx_port")) - { - config_ptr->agent_rx_port = atoi(value); - config_ptr->mask |= CONFIG_AGENT_RX_PORT ; - } - else if (MATCH("client", "rx_port")) - { - config_ptr->client_rx_port = atoi(value); - config_ptr->mask |= CONFIG_CLIENT_RX_PORT ; - } - else if (MATCH("client", "hbs_pulse_period")) - { - config_ptr->hbs_pulse_period = atoi(value); - } - else if (MATCH("client", "hbs_failure_threshold")) - { - config_ptr->hbs_failure_threshold = atoi(value); - } -#ifdef WANT_REPORT_DELAY - else if (MATCH("timeouts", "start_delay")) - { - config_ptr->start_delay = atoi(value); - } -#endif - else - { - return (PASS); - } - return (FAIL); -} - -/* Read the guest.ini file and load agent */ -/* settings into the daemon configuration */ -int daemon_configure ( void ) -{ - int rc = FAIL ; - - /* Read the ini */ - char config_fn[100] ; - guest_config.mask = 0 ; - sprintf ( &config_fn[0], "/etc/mtc/%s.ini", program_invocation_short_name ); - if (ini_parse(config_fn, _config_handler, &guest_config) < 0) - { - elog("Can't load '%s'\n", config_fn ); - return (FAIL_LOAD_INI); - } - - get_debug_options ( config_fn, &guest_config ); - - /* Verify loaded config against an expected mask - * as an ini file fault detection method */ - if ( guest_config.mask != CONFIG_MASK ) - { - elog ("Configuration load failed (%x)\n", - (( -1 ^ guest_config.mask ) & CONFIG_MASK) ); - rc = FAIL_INI_CONFIG ; - } - else - { - guest_config.mgmnt_iface = daemon_get_iface_master ( guest_config.mgmnt_iface ); - ilog("Guest Agent : %s:%d\n", guest_config.mgmnt_iface, guest_config.client_rx_port ); - - // get_iface_macaddr ( guest_config.mgmnt_iface, my_macaddr ); - get_iface_address ( guest_config.mgmnt_iface, ctrl.address, true ); - get_hostname ( &ctrl.hostname[0], MAX_HOST_NAME_SIZE ); - - ilog("Report Thres: %d\n", guest_config.hbs_failure_threshold ); -#ifdef WANT_REPORT_DELAY - ilog("Report Delay: %d sec\n", guest_config.start_delay ); -#endif - ilog("Deflt Period: %d msec\n", guest_config.hbs_pulse_period ); - rc = PASS ; - } - - return (rc); -} - - -/****************************/ -/* Initialization Utilities */ -/****************************/ - -/* Setup UDP messaging to the guestAgent. */ -int _socket_init ( void ) -{ - int rc = PASS ; - - guestAgent_ip = getipbyname ( CONTROLLER ); - ilog ("ControllerIP: %s\n", guestAgent_ip.c_str()); - - /* Read the ports the socket struct */ - ctrl.sock.agent_rx_port = guest_config.agent_rx_port ; - ctrl.sock.server_rx_port = guest_config.client_rx_port ; - - /****************************/ - /* Setup the Receive Socket */ - /****************************/ - ctrl.sock.server_rx_sock = new msgClassRx(ctrl.address.c_str(), guest_config.client_rx_port, IPPROTO_UDP); - rc = ctrl.sock.server_rx_sock->return_status; - if ( rc ) - { - elog ("Failed to setup 'guestAgent' receiver on port %d\n", - ctrl.sock.server_rx_port ); - return (rc) ; - } - ctrl.sock.server_tx_sock = new msgClassTx(guestAgent_ip.c_str(), guest_config.agent_rx_port, IPPROTO_UDP, guest_config.mgmnt_iface); - rc = ctrl.sock.server_tx_sock->return_status; - if ( rc ) - { - elog ("Failed to setup 'guestServer' transmiter\n" ); - return (rc) ; - } - - return (rc); -} - -/* The main heartbeat service loop */ -int daemon_init ( string iface, string nodeType_str ) -{ - int rc = PASS ; - - ctrl.address.clear() ; - ctrl.address_peer.clear(); - ctrl.nodetype = CGTS_NODE_NULL ; - - /* Init the Inotify descriptors */ - ctrl.inotify_dir_fd = 0 ; - ctrl.inotify_dir_wd = 0 ; - - /* clear hostname */ - memset ( &ctrl.hostname[0], 0, MAX_HOST_NAME_SIZE ); - - /* Initialize socket construct and pointer to it */ - memset ( &ctrl.sock, 0, sizeof(ctrl.sock)); - - /* Assign interface to config */ - guest_config.mgmnt_iface = (char*)iface.data() ; - - if ( (rc = daemon_files_init ( )) != PASS ) - { - elog ("Pid, log or other files could not be opened (rc:%d)\n", rc ); - rc = FAIL_FILES_INIT ; - } - - /* convert node type to integer */ - ctrl.nodetype = get_host_function_mask ( nodeType_str ) ; - ilog ("Node Type : %s (%d)\n", nodeType_str.c_str(), ctrl.nodetype ); - - /* Bind signal handlers */ - if ( daemon_signal_init () != PASS ) - { - elog ("daemon_signal_init failed\n"); - return ( FAIL_SIGNAL_INIT ); - } - - /************************************************************************ - * There is no point continuing with init ; i.e. running daemon_configure, - * initializing sockets and trying to query for an ip address until the - * daemon's configuration requirements are met. Here we wait for those - * flag files to be present before continuing. - ************************************************************************ - * Wait for /etc/platform/.initial_config_complete & /var/run/.goenabled */ - daemon_wait_for_file ( CONFIG_COMPLETE_FILE , 0); - daemon_wait_for_file ( GOENABLED_MAIN_READY , 0); - - /* Configure the client */ - if ( (rc = daemon_configure ()) != PASS ) - { - elog ("Daemon service configuration failed (rc:%d)\n", rc ); - rc = FAIL_DAEMON_CONFIG ; - } - - /* Setup the heartbeat service messaging sockets */ - else if ( (rc = _socket_init ( )) != PASS ) - { - elog ("socket initialization failed (rc:%d)\n", rc ); - rc = FAIL_SOCKET_INIT; - } - - /* Ignore this signal */ - signal(SIGPIPE, SIG_IGN); - - return (rc); -} - -/* - { hostname" : "" , - "instances" : - [ - { "channel" : "" , "services" : - [ - { "service":"heartbeat", "admin":"enabled", "oper":"enabled" , "avail":"available" } - ], - "channel: : "" , "services" : - [ - { "service":"heartbeat", "admin":"enabled", "oper":"enabled" , "avail":"available"} - ] - } - ] - } -*/ - - -int select_failure_count = 0 ; - -void guestInstClass::manage_comm_loss ( void ) -{ - int rc ; - - std::list socks ; - socks.clear(); - - waitd.tv_sec = 0; - waitd.tv_usec = GUEST_SOCKET_TO; - - /* Initialize the master fd_set */ - FD_ZERO(&inotify_readfds); - - /* check for empty list condition */ - if ( inst_head ) - { - for ( struct inst * inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - if ( inst_ptr->instance.inotify_file_fd ) - { - //ilog ("adding inotify_fd %d for %s to select list\n", - // inst_ptr->instance.inotify_file_fd, - // inst_ptr->instance.uuid.c_str()); - - socks.push_front ( inst_ptr->instance.inotify_file_fd ); - FD_SET ( inst_ptr->instance.inotify_file_fd, &inotify_readfds); - } - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - - /* if there are no sockets to monitor then just exit */ - if ( socks.empty() ) - return ; - - /* Call select() and wait only up to SOCKET_WAIT */ - socks.sort(); - rc = select( socks.back()+1, &inotify_readfds, NULL, NULL, &waitd); - if (( rc < 0 ) || ( rc == 0 ) || ( rc > (int)socks.size())) - { - /* Check to see if the select call failed. */ - /* ... but filter Interrupt signal */ - if (( rc < 0 ) && ( errno != EINTR )) - { - wlog_throttled ( select_failure_count, 20, - "socket select failed (%d:%m)\n", errno); - } - else if ( rc > (int)socks.size()) - { - wlog_throttled ( select_failure_count, 100, - "Select return exceeds current file descriptors (%ld:%d)\n", - socks.size(), rc ); - } - else - { - select_failure_count = 0 ; - } - } - else - { - wlog ( "inotify channel event\n"); - - for ( struct inst * inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - if ( inst_ptr->instance.inotify_file_fd ) - { - if (FD_ISSET(inst_ptr->instance.inotify_file_fd, &inotify_readfds) ) - { - ilog ("Watch Event on instance %s\n", inst_ptr->instance.uuid.c_str()); - guestUtil_inotify_events (inst_ptr->instance.inotify_file_fd); - } - } - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - } - } -} - - - -#define MAX_LEN 300 -void daemon_service_run ( void ) -{ - int rc = 0 ; - int count = 0 ; - int flush_thld = 0 ; - - string payload = "" ; /* for the ready event */ - - std::list socks ; - - guestUtil_load_channels (); - - /* Setup inotify to watch for new instance serial IO channel creations */ - if ( set_inotify_watch ( QEMU_CHANNEL_DIR, - ctrl.inotify_dir_fd, - ctrl.inotify_dir_wd ) ) - { - elog ("failed to setup inotify on %s\n", QEMU_CHANNEL_DIR ); - } - - socks.clear(); - socks.push_front (ctrl.sock.server_rx_sock->getFD()); - if ( ctrl.inotify_dir_fd ) - socks.push_front (ctrl.inotify_dir_fd); - else - { - elog ("unable to inotify monitor %s\n", QEMU_CHANNEL_DIR ); - - // TODO: consider exiting daemon - } - socks.sort(); - - mtcTimer_init ( ctrl.timer, ctrl.hostname ); - mtcTimer_init ( instInv.search_timer, ctrl.hostname ); - - mtcTimer_start ( ctrl.timer , guestTimer_handler, 2 ); - mtcTimer_start ( instInv.search_timer, guestTimer_handler, SEARCH_AUDIT_TIME ); - - ilog ("Selects: guestAgent:%d qemuDir:%d\n", ctrl.sock.server_rx_sock->getFD(), ctrl.inotify_dir_fd ); - ilog ("-------------------------------------------------------\n"); - - /* Tell the guestAgent that we started or restarted - * so that it can send instance state data */ - payload = "{\"hostname\":\"" ; - payload.append(ctrl.hostname); - payload.append("\"}"); - - /* Run heartbeat service forever or until stop condition */ - for ( ; ; ) - { - instInv.waitd.tv_sec = 0; - instInv.waitd.tv_usec = GUEST_SOCKET_TO; - - /* Initialize the master fd_set */ - FD_ZERO(&instInv.message_readfds); - - FD_SET ( ctrl.sock.server_rx_sock->getFD(), &instInv.message_readfds); - if ( ctrl.inotify_dir_fd ) - { - FD_SET ( ctrl.inotify_dir_fd, &instInv.message_readfds); - } - - rc = select( socks.back()+1, &instInv.message_readfds, NULL, NULL, &instInv.waitd); - if (( rc < 0 ) || ( rc == 0 ) || ( rc > (int)socks.size())) - { - /* Check to see if the select call failed. */ - /* ... but filter Interrupt signal */ - if (( rc < 0 ) && ( errno != EINTR )) - { - wlog_throttled ( count, 20, "socket select failed (%d:%m)\n", errno); - } - else if ( rc > (int)socks.size()) - { - wlog_throttled ( count, 100, "Select return exceeds current file descriptors (%ld:%d)\n", - socks.size(), rc ); - } - else - { - count = 0 ; - } - } - else if (FD_ISSET(ctrl.sock.server_rx_sock->getFD(), &instInv.message_readfds)) - { - /* clean the rx/tx buffer */ - mtc_message_type msg ; - memset ((void*)&msg,0,sizeof(mtc_message_type)); - - int bytes = ctrl.sock.server_rx_sock->read((char*)&msg.hdr[0], sizeof(mtc_message_type)); - ctrl.address_peer = ctrl.sock.server_rx_sock->get_src_str() ; - mlog1 ("Received %d bytes from %s:%d:guestAgent\n", bytes, - ctrl.sock.server_rx_sock->get_src_str(), - ctrl.sock.server_rx_sock->get_dst_addr()->getPort() ); - print_mtc_message (&msg); - - if ( bytes > 0 ) - { - recv_from_guestAgent ( msg.cmd, &msg.buf[0] ); - } - } - - else if (FD_ISSET(ctrl.inotify_dir_fd, &instInv.message_readfds)) - { - dlog ("%s dir change\n", QEMU_CHANNEL_DIR ); - - guestUtil_inotify_events (ctrl.inotify_dir_fd); - } - - fflush (stdout); - fflush (stderr); - - instInv.guest_fsm_run ( ); - - if ( ctrl.timer.ring == true ) - { - /* restart the timer and try again if this call returns a RETRY */ - if ( send_to_guestAgent ( MTC_EVENT_MONITOR_READY, payload.data()) == RETRY ) - { - mtcTimer_start ( ctrl.timer, guestTimer_handler, 5 ); - } - ctrl.timer.ring = false ; - } - - daemon_signal_hdlr (); - - /* Support the log flush config option */ - if ( guest_config.flush ) - { - if ( ++flush_thld > guest_config.flush_thld ) - { - flush_thld = 0 ; - fflush (stdout); - fflush (stderr); - } - } - } - daemon_exit (); -} -/* Write the daemon /var/log/.dump */ -void daemon_dump_info ( void ) -{ - daemon_dump_membuf_banner (); - - instInv.print_node_info (); - instInv.memDumpAllState (); - - daemon_dump_membuf(); -} - -const char MY_DATA [100] = { "eieio\n" } ; -const char * daemon_stream_info ( void ) -{ - return (&MY_DATA[0]); -} - -/*************************************************************************** - * * - * Module Test Head * - * * - ***************************************************************************/ - -/** Teat Head Entry */ -int daemon_run_testhead ( void ) -{ - int rc = PASS; - return (rc); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestStubs.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestStubs.cpp deleted file mode 100644 index 5a99dc4d..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestStubs.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2013, 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Nodal Health Check Agent Stubs - */ - -#include - -using namespace std; - -#include "nodeBase.h" -#include "nodeUtil.h" diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrFsm.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestSvrFsm.cpp deleted file mode 100644 index 6add43bb..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrFsm.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2013, 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -/*************************************************************************** - * - * @file - * Wind River CGTS Platform "Guest Services - Finite State Machine" - * - * - * This FSM handles the following actions - * - * FSM_ACTION__CONNECT - * - */ - -#include -#include - -using namespace std; - -#include "nodeBase.h" -#include "nodeTimers.h" -#include "guestBase.h" -#include "guestInstClass.h" -#include "guestSvrUtil.h" - -void guestInstClass::fsm_run ( void ) -{ - int rc = PASS ; - struct inst * inst_ptr = static_cast(NULL) ; - - if (( instances > 0 ) ) - { - /* get new messages */ - readInst(); - - for ( inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - if ( inst_ptr->message_list.size() ) - { - guestInstClass::message_handler ( inst_ptr ); - } - - if ( inst_ptr->action == FSM_ACTION__NONE ) - { - guestInstClass::monitor_handler ( inst_ptr ); - } - - else if ( inst_ptr->action == FSM_ACTION__CONNECT ) - { - rc = guestInstClass::connect_handler ( inst_ptr ); - if ( rc == RETRY ) - return ; - } - else - { - slog ("unknown action (%d) for instance %s\n", - inst_ptr->action, inst_ptr->instance.uuid.c_str()); - } - -#ifdef WANT_LOSS_FIT - if ( inst_ptr->heartbeat_count > 10 ) - { - mtcTimer_stop ( inst_ptr->monitor_timer ); - mtcWait_secs (1); - start_monitor_timer ( inst_ptr ); - inst_ptr->heartbeat_count = 0 ; - } -#endif - - /* exit if this happens to be the last one in the list */ - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - } - else if ( inst_head != NULL ) - { - slog ("head pointer is not NULL while there are no instances (%p)\n", inst_head ); - } - - if ( search_timer.ring == true ) - { - guestUtil_channel_search (); - mtcTimer_start ( search_timer, guestTimer_handler, SEARCH_AUDIT_TIME ); - } - - /* Make this part of the connect FSM */ - manage_comm_loss ( ); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrHdlr.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestSvrHdlr.cpp deleted file mode 100644 index c8ab31ca..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrHdlr.cpp +++ /dev/null @@ -1,1420 +0,0 @@ -/* - * Copyright (c) 2015-2018 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -/**************************************************************************** - * @file - * Wind River CGTS Platform Guest Services "Handlers" Implementation - * - * Description: This file contains the following FSM handlers, - - * Interfaces: - * - * guestInstClass::timer_handler - * guestInstClass::monitor_handler - * guestInstClass::connect_handler - * - ****************************************************************************/ - -#include -#include "nodeBase.h" -#include "nodeUtil.h" /* for ... clean_bm_response_files */ -#include "nodeTimers.h" /* for ... mtcTimer_start/stop */ -#include "jsonUtil.h" /* for ... jsonApi_array_value */ -#include "daemon_common.h" - -#include "guestBase.h" /* for ... */ -#include "guestUtil.h" /* for ... guestUtil_print_instance */ -#include "guestSvrUtil.h" /* for ... hb_get_message_type_name */ -#include "guestVirtio.h" /* for ... */ -#include "guestSvrMsg.h" /* for ... */ -#include "guestInstClass.h" /* for ... */ - -static int failure_reporting_count = 0 ; - -void voteStateChange ( instInfo * instInfo_ptr , hb_state_t newState ) -{ - if ( instInfo_ptr->vnState == newState ) - return ; - - clog ("%s '%s' -> '%s'\n", - log_prefix(instInfo_ptr).c_str(), - hb_get_state_name(instInfo_ptr->vnState), - hb_get_state_name(newState)); - - instInfo_ptr->vnState = newState ; -} - -void beatStateChange ( instInfo * instInfo_ptr , hb_state_t newState ) -{ - if ( instInfo_ptr->hbState == newState ) - return ; - - if ((( instInfo_ptr->hbState == hbs_server_waiting_challenge ) && - ( newState == hbs_server_waiting_response )) || - (( instInfo_ptr->hbState == hbs_server_waiting_response ) && - ( newState == hbs_server_waiting_challenge ))) - { - ; /* don't print heartbeat state changes */ - } - else if (( newState == hbs_server_waiting_init ) && - ( instInfo_ptr->hbState != hbs_server_waiting_init )) - { - ilog ("%s waiting for init ... \n", log_prefix(instInfo_ptr).c_str()); - } - else - { - clog ("%s '%s' -> '%s'\n", - log_prefix(instInfo_ptr).c_str(), - hb_get_state_name(instInfo_ptr->hbState), - hb_get_state_name(newState)); - } - instInfo_ptr->hbState = newState ; -} - -void hbStatusChange ( instInfo * instInfo_ptr, bool status ) -{ - if ( instInfo_ptr->heartbeating != status ) - { - instInfo_ptr->heartbeating = status ; - string payload = guestUtil_set_inst_info ( get_ctrl_ptr()->hostname , instInfo_ptr ); - - if ( status == true ) - { - ilog ("%s is now heartbeating\n", log_prefix(instInfo_ptr).c_str()); - send_to_guestAgent ( MTC_EVENT_HEARTBEAT_RUNNING, payload.data()); - } - else - { - ilog ("%s is not heartbeating\n", log_prefix(instInfo_ptr).c_str()); - send_to_guestAgent ( MTC_EVENT_HEARTBEAT_STOPPED, payload.data()); - } - - jlog ("%s Heartbeating State Change: %s\n", log_prefix(instInfo_ptr).c_str(), payload.c_str()); - } - else - { - clog ("%s heartbeating is still %s\n", - log_prefix(instInfo_ptr).c_str(), status ? "enabled" : "disabled" ); - } -} - - -void manage_heartbeat_failure ( instInfo * instInfo_ptr ) -{ - instInfo_ptr->heartbeat.failed = true ; - - dlog ("%s calling hbStatusChange false\n", log_prefix(instInfo_ptr).c_str()); - - hbStatusChange ( instInfo_ptr, false) ; /* heartbeating is now false */ - - beatStateChange ( instInfo_ptr, hbs_server_waiting_init ) ; -} - -/* Looks up the timer ID and asserts the corresponding node's ringer */ -void guestInstClass::timer_handler ( int sig, siginfo_t *si, void *uc) -{ - struct guestInstClass::inst * inst_ptr ; - timer_t * tid_ptr = (void**)si->si_value.sival_ptr ; - - ctrl_type * ctrl_ptr = get_ctrl_ptr(); - - /* Avoid compiler errors/warnings for parms we must - * have but currently do nothing with */ - sig=sig ; uc = uc ; - - if ( !(*tid_ptr) ) - { - return ; - } - - else if ( *tid_ptr == search_timer.tid ) - { - mtcTimer_stop_int_safe ( search_timer ); - search_timer.ring = true ; - return ; - } - else if ( *tid_ptr == ctrl_ptr->timer.tid ) - { - mtcTimer_stop_int_safe ( ctrl_ptr->timer ); - ctrl_ptr->timer.ring = true ; - return ; - } - - for ( int timer_id = INST_TIMER_MONITOR ; timer_id < INST_TIMER_MAX ; timer_id++ ) - { - if ( ( inst_ptr = guestInstClass::getInst_timer ( *tid_ptr , timer_id ) ) != NULL ) - { - switch ( timer_id ) - { - case INST_TIMER_MONITOR: - { - if (( *tid_ptr == inst_ptr->monitor_timer.tid ) ) - { - mtcTimer_stop_int_safe ( inst_ptr->monitor_timer ); - inst_ptr->monitor_timer.ring = true ; - return ; - } - break ; - } - case INST_TIMER_CONNECT: - { - if (( *tid_ptr == inst_ptr->connect_timer.tid ) ) - { - mtcTimer_stop_int_safe ( inst_ptr->connect_timer ); - inst_ptr->connect_timer.ring = true ; - return ; - } - break ; - } - case INST_TIMER_RECONNECT: - { - if (( *tid_ptr == inst_ptr->reconnect_timer.tid ) ) - { - mtcTimer_stop_int_safe ( inst_ptr->reconnect_timer ); - inst_ptr->reconnect_timer.ring = true ; - - return ; - } - break ; - } - case INST_TIMER_INIT: - { - if (( *tid_ptr == inst_ptr->init_timer.tid ) ) - { - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_init ) ; - mtcTimer_stop_int_safe ( inst_ptr->init_timer ); - return ; - } - break ; - } - case INST_TIMER_VOTE: - { - if (( *tid_ptr == inst_ptr->vote_timer.tid ) ) - { - mtcTimer_stop_int_safe ( inst_ptr->vote_timer ); - inst_ptr->vote_timer.ring = true ; - return ; - } - break ; - } - default: - { - // slog ("unknown timer id (%d)\n", timer_id); - } - } /* end switch */ - } /* end if */ - } /* end for */ -} - -/* guest services timer object wrapper - * - does a instance lookup and calls the timer handler */ -void guestTimer_handler ( int sig, siginfo_t *si, void *uc) -{ - get_instInv_ptr()->timer_handler ( sig, si, uc ); -} - -void guestInstClass::start_monitor_timer ( struct guestInstClass::inst * inst_ptr ) -{ - if ( inst_ptr->monitor_timer.tid ) - mtcTimer_stop ( inst_ptr->monitor_timer ); - - mtcTimer_start_sec_msec ( &inst_ptr->monitor_timer, - guestTimer_handler, - (inst_ptr->instance.heartbeat_interval_ms/1000), - (inst_ptr->instance.heartbeat_interval_ms%1000)); -} - -void _schedule_init_timer ( string event_type , struct mtc_timer & timer ) -{ - if (( !event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_SUSPEND) ) || - ( !event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_LIVE_MIGRATE_BEGIN) ) || - ( !event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_COLD_MIGRATE_BEGIN) ) || - ( !event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_REBOOT))) - { - if ( timer.tid ) - mtcTimer_stop ( timer ); - mtcTimer_start ( timer, guestTimer_handler, WAIT_FOR_INIT_TIMEOUT ); - ilog ("scheduling waiting_init transition in %d seconds\n", WAIT_FOR_INIT_TIMEOUT ); - } -} - -/* extend the reconnect time as the attempts pile up. max out at 1 minute. */ -void manage_reconnect_timeout ( instInfo * instInfo_ptr ) -{ - /* extend the reconnect time as the attempts pile up. max out at 1 minute. */ - if ( (instInfo_ptr->connect_wait_in_secs*2) > MTC_MINS_1 ) - instInfo_ptr->connect_wait_in_secs = MTC_MINS_1 ; - else - instInfo_ptr->connect_wait_in_secs *= 2 ; -} - -int connect_count = 0 ; -int guestInstClass::connect_handler ( struct guestInstClass::inst * inst_ptr ) -{ - int rc = PASS ; - switch ( inst_ptr->connectStage ) - { - case INST_CONNECT__START: - { - if ( inst_ptr->instance.connected == true ) - { - inst_ptr->connectStage = INST_CONNECT__START ; - inst_ptr->action = FSM_ACTION__NONE ; - - if (inst_ptr->connect_timer.tid) - mtcTimer_stop ( inst_ptr->connect_timer ); - } - else - { - ilog ("%s connect attempt in %d seconds\n", - log_prefix(&inst_ptr->instance).c_str(), inst_ptr->instance.connect_wait_in_secs); - inst_ptr->instance.connecting = true ; - mtcTimer_start ( inst_ptr->connect_timer, guestTimer_handler, inst_ptr->instance.connect_wait_in_secs ); - inst_ptr->connectStage = INST_CONNECT__WAIT ; - } - break ; - } - case INST_CONNECT__WAIT: - { - if ( inst_ptr->instance.connecting != true ) - { - slog ("%s bad connect wait state ; auto correcting\n", - log_prefix(&inst_ptr->instance).c_str()); - - inst_ptr->connectStage = INST_CONNECT__START ; - inst_ptr->action = FSM_ACTION__NONE ; - } - - else if ( inst_ptr->connect_timer.ring == true ) - { - char buf[PATH_MAX]; - - inst_ptr->connect_timer.ring = false ; - - /* if the socket is not there then don't try and connect to it */ - snprintf(buf, sizeof(buf), "%s/cgcs.heartbeat.%s.sock", QEMU_CHANNEL_DIR, inst_ptr->instance.uuid.data()); - if ( daemon_is_file_present ( buf ) ) - { - /* Try to connect with virtio_channel_connect ... - * If that succeeds then go DONE. - * if that fails with a ENOENT hen that means the socket fd is gone do close and delete instance - * otherwise retry the connect - */ - - ilog ( "%s connect start\n", log_prefix(&inst_ptr->instance).c_str()); - rc = virtio_channel_connect ( &inst_ptr->instance ); - if ( rc == PASS ) - { - inst_ptr->connectStage = INST_CONNECT__DONE ; - break ; - } - /* Abort connect if the instance channel is no longer there. - * -1 and errno=2 : No such file or directory) */ - else if (( rc == -1 ) && ( errno == ENOENT )) - { - ilog ("%s channel gone\n", log_prefix(&inst_ptr->instance).c_str() ); - del_inst ( inst_ptr->instance.uuid ); - return (RETRY); - } - else - { - wlog ("%s channel connect failed\n", - log_prefix(&inst_ptr->instance).c_str() ); - manage_reconnect_timeout ( &inst_ptr->instance ); - } - } - else - { - ilog ("%s does not exist\n", buf ); - manage_reconnect_timeout ( &inst_ptr->instance ); - } - inst_ptr->connectStage = INST_CONNECT__START ; - } - break ; - } - case INST_CONNECT__DONE: - { - - inst_ptr->connectStage = INST_CONNECT__START ; - inst_ptr->action = FSM_ACTION__NONE ; - - inst_ptr->instance.connecting = false ; - inst_ptr->instance.connected = true ; - - failure_reporting_count = 0 ; - - /* no longer failed */ - inst_ptr->instance.heartbeat.failed = false ; - inst_ptr->instance.heartbeat.b2b_misses = 0 ; - - /* waiting for init message */ - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_init ) ; - - /* default back to the start 2 second reconnect time default */ - inst_ptr->instance.connect_wait_in_secs = DEFAULT_CONNECT_WAIT ; - - start_monitor_timer ( inst_ptr ); - - if ( inst_ptr->reconnect_timer.tid ) - mtcTimer_stop ( inst_ptr->reconnect_timer ); - mtcTimer_start ( inst_ptr->reconnect_timer, guestTimer_handler, HEARTBEAT_START_TIMEOUT ); - - ilog ("%s connect done\n", log_prefix(&inst_ptr->instance).c_str()); - - break ; - } - default: - { - slog ("Unsupported connect stage (%d) ... correcting\n", inst_ptr->connectStage ); - inst_ptr->connectStage = INST_CONNECT__START ; - } - } - return(rc); -} - -int guestInstClass::monitor_handler ( struct guestInstClass::inst * inst_ptr ) -{ - int rc = PASS ; - -#ifdef WANT_THIS - clog ("%s in '%s:%s' state - stage %d - R:%c F:%c H:%c\n", - log_prefix(&inst_ptr->instance).c_str(), - hb_get_state_name(inst_ptr->instance.hbState), - hb_get_state_name(inst_ptr->instance.vnState), - inst_ptr->monitorStage, - inst_ptr->instance.heartbeat.reporting ? 'Y' : 'n', - inst_ptr->instance.heartbeat.failed ? 'Y' : 'n', - inst_ptr->instance.heartbeating ? 'Y' : 'n'); - // inst_ptr->instance.heartbeat.waiting ? 'Y' : 'n'); -#endif - - switch ( inst_ptr->monitorStage ) - { - case INST_MONITOR__STEADY: - { - /* Manage Reconnect Timer */ - if ( inst_ptr->reconnect_timer.ring == true ) - { - inst_ptr->reconnect_timer.ring = false ; - if (( inst_ptr->instance.heartbeating == false ) && - ( inst_ptr->instance.connecting == false )) - { - /* If this timer rings and heartbeating is not started - * then we need to close the connection and repoen it - * Since the re-open is automatic all we need to do is - * close it here */ - wlog ("%s issuing auto-reconnect ; no heartbeating\n", - log_prefix(&inst_ptr->instance).c_str() ); - - reconnect_start ( inst_ptr->instance.uuid.data() ); - } - mtcTimer_start ( inst_ptr->reconnect_timer, guestTimer_handler, HEARTBEAT_START_TIMEOUT ); - } - - /* Manage Monitor Timer - expires in 3 cases - * 1. heartbeat miss - hbs_server_waiting_response - * 2. heartbeat done - hbs_server_waiting_challenge - interval is done and ready for the next one - * 3. heartbeat none - not heartbeating ; waiting for init - * 4. heratbeat fail - in wrong state - **/ - if ( inst_ptr->monitor_timer.ring == true ) - { - inst_ptr->monitor_timer.ring = false ; - - /* Case 1: heartbeat miss while waiting for heartbeat response */ - if ( inst_ptr->instance.hbState == hbs_server_waiting_response ) - { - int threshold = daemon_get_cfg_ptr()->hbs_failure_threshold ; - if (( inst_ptr->instance.heartbeat.failed == true ) || - ( inst_ptr->instance.heartbeat.reporting == false )) - { - hbStatusChange ( &inst_ptr->instance, false ); - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_init) ; - } - else if ( ++inst_ptr->instance.heartbeat.b2b_misses > threshold ) - { - inst_ptr->instance.message_count = 0 ; - inst_ptr->instance.heartbeat.b2b_misses = 0 ; - - elog ("%s *** Heartbeat Loss *** (Timeout=%d msec)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.heartbeat_interval_ms ); - - manage_heartbeat_failure ( &inst_ptr->instance ); - inst_ptr->monitorStage = INST_MONITOR__FAILURE ; - } - else - { - wlog ("%s *** Heartbeat Miss *** %d of %d (Timeout=%d msec)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.heartbeat.b2b_misses, - threshold, - inst_ptr->instance.heartbeat_interval_ms ); - /* Send another challenge */ - send_challenge ( inst_ptr ) ; - } - } - - /* Case 2: Heartbeat done and the interval is expired. - * Just start another challenge request - */ - else if (( inst_ptr->instance.hbState != hbs_server_waiting_init ) && - ( inst_ptr->instance.hbState != hbs_server_waiting_response) && - ( inst_ptr->instance.heartbeat.waiting == false )) - { - // printf ("*"); - /* Send another challenge */ - inst_ptr->instance.heartbeat.b2b_misses = 0 ; - send_challenge ( inst_ptr ) ; - } - - /* Case 3: The monitor timer still runs while we are in the - * waiting for init state so just make sure we are - * handling init stuff - */ - else if ( inst_ptr->instance.hbState == hbs_server_waiting_init ) - { - clog ("%s is %s\n", log_prefix(&inst_ptr->instance).c_str(), - hb_get_state_name(inst_ptr->instance.hbState)); - inst_ptr->messageStage = INST_MESSAGE__RECEIVE ; - inst_ptr->instance.message_count = 0 ; - inst_ptr->instance.heartbeat.b2b_misses = 0 ; - } - - /* Case 4: Heratbeat has failed while we are in the wrong state */ - else - { - int threshold = daemon_get_cfg_ptr()->hbs_failure_threshold ; - if ( inst_ptr->instance.heartbeat.failed == true ) - { - ; /* nothing to do while failed */ - } - else if ( inst_ptr->instance.heartbeat.reporting == false ) - { - /* Send a challenge to keep the heartbeat going */ - send_challenge ( inst_ptr ) ; - } - else if ( ++inst_ptr->instance.heartbeat.b2b_misses > threshold ) - { - inst_ptr->instance.message_count = 0 ; - inst_ptr->instance.heartbeat.b2b_misses = 0 ; - - elog ("%s *** Heartbeat Loss *** (state:%s)\n", - log_prefix(&inst_ptr->instance).c_str(), - hb_get_state_name(inst_ptr->instance.hbState)); - - manage_heartbeat_failure ( &inst_ptr->instance ); - inst_ptr->monitorStage = INST_MONITOR__FAILURE ; - } - else - { - wlog ("%s *** Heartbeat Miss *** (state:%s)\n", - log_prefix(&inst_ptr->instance).c_str(), - hb_get_state_name(inst_ptr->instance.hbState)); - /* Send another challenge */ - send_challenge ( inst_ptr ) ; - } - } - } - - if ( inst_ptr->vote_timer.ring == true ) - { - if ( inst_ptr->instance.vnState == hbs_client_waiting_shutdown_response ) - { - // handle time out as silent agreement to accept - if ( !inst_ptr->instance.msg_type.compare(GUEST_HEARTBEAT_MSG_ACTION_NOTIFY) || - !inst_ptr->instance.msg_type.compare(GUEST_HEARTBEAT_MSG_ACTION_RESPONSE) ) - { - ilog ("%s response time out on '%s' message ; proceeding with action\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.msg_type.c_str()); - - string reject_reason = ""; - string vote_result = GUEST_HEARTBEAT_MSG_VOTE_RESULT_UNKNOWN; - if (!inst_ptr->instance.notification_type.compare(GUEST_HEARTBEAT_MSG_NOTIFY_REVOCABLE)) - { - vote_result = GUEST_HEARTBEAT_MSG_VOTE_RESULT_ACCEPT; - } - else if (!inst_ptr->instance.notification_type.compare(GUEST_HEARTBEAT_MSG_NOTIFY_IRREVOCABLE)) - { - vote_result = GUEST_HEARTBEAT_MSG_VOTE_RESULT_COMPLETE; - } - else - { - wlog ("%s Unexpected '%s' notify timeout ; proceeding with action\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.notification_type.c_str()); - } - send_vote_notify_resp (get_ctrl_ptr()->hostname, - inst_ptr->instance.uuid, - inst_ptr->instance.notification_type, - inst_ptr->instance.event_type, - vote_result, reject_reason); - } - - _schedule_init_timer ( inst_ptr->instance.event_type , - inst_ptr->init_timer) ; - - voteStateChange ( &inst_ptr->instance, hbs_server_waiting_init ); - } - inst_ptr->vote_timer.ring = false ; - } - break ; - } - case INST_MONITOR__DELAY: - { - if ( inst_ptr->monitor_timer.ring == true ) - { - inst_ptr->monitorStage = INST_MONITOR__FAILURE ; - } - break ; - } - case INST_MONITOR__FAILURE: - { - if ( get_instInv_ptr()->reporting == false ) - { - wlog_throttled (failure_reporting_count, 100, "host level reporting is disabled\n"); - } - else if ( inst_ptr->instance.heartbeat.reporting == false ) - { - wlog_throttled (failure_reporting_count, 100, "%s instance level reporting is disabled\n", - log_prefix(&inst_ptr->instance).c_str()); - } - else - { - inst_ptr->instance.heartbeat.failures++ ; - - wlog ("%s sending failure notification to guestAgent (failures:%d)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.heartbeat.failures); - - string payload = "" ; - payload.append ("{\"hostname\":\""); - payload.append (get_ctrl_ptr()->hostname); - payload.append ("\",\"uuid\":\""); - payload.append (inst_ptr->instance.uuid); - payload.append ("\"}"); - - jlog1 ("%s Failure Event Payload: %s\n", - log_prefix(&inst_ptr->instance).c_str(), payload.c_str()); - - send_to_guestAgent ( MTC_EVENT_HEARTBEAT_LOSS , payload.data()); - failure_reporting_count = 0 ; - } - // inst_ptr->instance.heartbeat.failed = false ; - inst_ptr->monitorStage = INST_MONITOR__STEADY ; - - break ; - } - default: - { - inst_ptr->monitorStage = INST_MONITOR__STEADY ; - break ; - } - } - - /* This will try to reconnect failed channels */ - if (( !inst_ptr->instance.connected ) || - (( inst_ptr->instance.chan_fd > 0 ) && ( inst_ptr->instance.chan_ok != true ))) - { - if ( inst_ptr->action == FSM_ACTION__NONE ) - { - ilog ("%s enabling connect FSM\n", log_prefix(&inst_ptr->instance).c_str()); - - hbStatusChange ( &inst_ptr->instance, false) ; - - inst_ptr->connectStage = INST_CONNECT__START ; - inst_ptr->action = FSM_ACTION__CONNECT ; - } - else if ( inst_ptr->action != FSM_ACTION__CONNECT ) - { - wlog ("%s bypassing reconnect due to existing action (%d)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->action); - } - } - - return (rc); -} - - -/***************************************************************************** - * - * Name : message_handler - * - * Purpose : Receive messages from the guest and trigger actions - * based on message content and type. - * - * Description: Only stage presently supported is INST_MESSAGE__RECEIVE - * for each connected socket. This FSM handler is not called - * unless there is a valid receive message to be handled. If - * for some reason there are no enqued messages then the FSM - * just returns having done thinting ; should not happen - * through. - * - * Currently supported message types are. - * - * GUEST_HEARTBEAT_MSG_INIT - vm heartbeat init message. - * > Action is to send an init_ack message to start heartbeating - * - * GUEST_HEARTBEAT_MSG_CHALLENGE_RESPONSE - a challenge response message - * > Action is to change state to 'hbs_server_waiting_challenge' - * and allow the heartbeat interval timer to expire in the - * monitor_handler which will then send another challenge - * request setting state back to 'hbs_server_waiting_response' - * - * Note: Unsupported messages are popped off the queue and discarded with - * an error log containing the message type. - * - *****************************************************************************/ -int guestInstClass::message_handler ( struct guestInstClass::inst * inst_ptr ) -{ - int rc = PASS ; - - switch ( inst_ptr->messageStage ) - { - case INST_MESSAGE__RECEIVE: - { - /* Only process if there are messages */ - if ( inst_ptr->message_list.size() ) - { - struct json_object *jobj_msg = inst_ptr->message_list.front(); - inst_ptr->message_list.pop_front(); - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_VERSION, &inst_ptr->instance.version) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_VERSION, jobj_msg); - return FAIL; - } - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_REVISION, &inst_ptr->instance.revision) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_REVISION, jobj_msg); - return FAIL; - } - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_MSG_TYPE, &inst_ptr->instance.msg_type) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_MSG_TYPE, jobj_msg); - return FAIL; - } - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_SEQUENCE, &inst_ptr->instance.sequence) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_SEQUENCE, jobj_msg); - return FAIL; - } - - mlog1 ("%s:%s message - Seq:%x Ver:%d.%d Fd:%d\n", - inst_ptr->instance.uuid.c_str(), - inst_ptr->instance.msg_type.c_str(), - inst_ptr->instance.sequence , - inst_ptr->instance.version, inst_ptr->instance.revision, - inst_ptr->instance.chan_fd); - - if ( !inst_ptr->instance.msg_type.compare(GUEST_HEARTBEAT_MSG_CHALLENGE_RESPONSE) ) - { - if ( inst_ptr->instance.hbState == hbs_server_waiting_response ) - { - uint32_t heartbeat_response; - string heartbeat_health; - string corrective_action; - string log_msg; - - inst_ptr->instance.heartbeat.waiting = false ; - - if ( daemon_get_cfg_ptr()->debug_work ) - printf ("-"); - - inst_ptr->heartbeat_count++ ; - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_HEARTBEAT_RESPONSE, &heartbeat_response) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_HEARTBEAT_RESPONSE, jobj_msg); - return FAIL; - } - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_HEARTBEAT_HEALTH, &heartbeat_health) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_HEARTBEAT_HEALTH, jobj_msg); - return FAIL; - } - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_CORRECTIVE_ACTION, &corrective_action) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_CORRECTIVE_ACTION, jobj_msg); - return FAIL; - } - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_LOG_MSG, &log_msg) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_LOG_MSG, jobj_msg); - return FAIL; - } - - if ( heartbeat_response != inst_ptr->instance.heartbeat_challenge) - { - inst_ptr->instance.health_count = 0 ; - wlog_throttled (inst_ptr->mismatch_count, 100, "%s challenge secret mismatch (%d:%d) (throttle:100)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.heartbeat_challenge, - heartbeat_response); - } - else if (!heartbeat_health.compare(GUEST_HEARTBEAT_MSG_HEALTHY)) - { - inst_ptr->mismatch_count = 0 ; - inst_ptr->instance.health_count = 0 ; - inst_ptr->instance.corrective_action_count = 0 ; - - mlog ("%s recv '%s' (seq:%x) (health:%s)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.msg_type.c_str(), inst_ptr->instance.sequence, heartbeat_health.c_str()); - - /* lets wait for the period timer to expire before - * sending another in the monitor_handler */ - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_challenge ) ; - - if ( inst_ptr->instance.heartbeating != true ) - { - hbStatusChange ( &inst_ptr->instance, true ); - } - - if (inst_ptr->instance.heartbeat.failed != false ) - { - inst_ptr->instance.heartbeat.failed = false ; - } - - ilog_throttled ( inst_ptr->instance.message_count, 1000, "%s is heartbeating ...(seq:%08x)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.sequence ); - } - else - { - const char *msg = json_object_to_json_string_ext(jobj_msg, JSON_C_TO_STRING_PLAIN); - ilog ("%s received unhealthy response message: %s\n", - log_prefix(&inst_ptr->instance).c_str(), msg ); - - inst_ptr->mismatch_count = 0 ; - - /* lets wait for the period timer to expire before - * sending another in the monitor_handler */ - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_challenge ) ; - - if ( inst_ptr->instance.health_count == 0 ) - { - if ( heartbeat_health.compare(GUEST_HEARTBEAT_MSG_UNHEALTHY) != 0 ) - { - wlog ("%s Invalid health reported (%s)\n", - log_prefix(&inst_ptr->instance).c_str(), - heartbeat_health.c_str() ); - } - - wlog_throttled ( inst_ptr->instance.health_count, 500, - "%s VM Unhealthy Message:\n", - log_prefix(&inst_ptr->instance).c_str()); - - wlog ("%s ... %s\n", log_prefix(&inst_ptr->instance).c_str(), - log_msg.c_str() ); - } - - inst_ptr->instance.unhealthy_corrective_action = corrective_action; - - if (!inst_ptr->instance.unhealthy_corrective_action.compare(GUEST_HEARTBEAT_MSG_ACTION_NONE) || - !inst_ptr->instance.unhealthy_corrective_action.compare(GUEST_HEARTBEAT_MSG_ACTION_UNKNOWN)) - { - wlog_throttled ( inst_ptr->instance.corrective_action_count, 500, - "%s corrective action is %s ; not reporting\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.unhealthy_corrective_action.c_str()); - } else { - inst_ptr->instance.unhealthy_failure = true ; - string payload = guestUtil_set_inst_info ( get_ctrl_ptr()->hostname , &inst_ptr->instance ); - inst_ptr->instance.unhealthy_failure = false ; - - ilog ("%s ill health notification\n", log_prefix(&inst_ptr->instance).c_str()); - send_to_guestAgent ( MTC_EVENT_HEARTBEAT_ILLHEALTH, payload.data()); - inst_ptr->instance.corrective_action_count = 0 ; - } - } - } - else if ( inst_ptr->instance.hbState == hbs_server_waiting_challenge ) - { - wlog ("%s received late '%s' response (seq:%x)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.msg_type.c_str(), - inst_ptr->instance.sequence); - } - else - { - dlog ("%s recv '%s' while in '%s' state (seq:%x)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.msg_type.c_str(), - hb_get_state_name(inst_ptr->instance.hbState), - inst_ptr->instance.sequence); - } - } - - else if ( !inst_ptr->instance.msg_type.compare(GUEST_HEARTBEAT_MSG_INIT) ) - { - const char *msg = json_object_to_json_string_ext(jobj_msg, JSON_C_TO_STRING_PLAIN); - ilog ("%s received init message: %s\n", - log_prefix(&inst_ptr->instance).c_str(), msg ); - - if (inst_ptr->instance.hbState != hbs_server_waiting_init) - { - wlog("%s unexpected 'init' message ; currState: '%s' (%d)\n", - log_prefix(&inst_ptr->instance).c_str(), - hb_get_state_name(inst_ptr->instance.hbState), - inst_ptr->instance.hbState ); - - /* Allow the heartbeat challenge response message log */ - inst_ptr->instance.message_count = 0 ; - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_init ) ; - } - else - { - string instance_name; - string response; - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_INVOCATION_ID, &inst_ptr->instance.invocation_id) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_INVOCATION_ID, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_NAME, &instance_name) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_NAME, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_CORRECTIVE_ACTION, &inst_ptr->instance.corrective_action) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_CORRECTIVE_ACTION, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_HEARTBEAT_INTERVAL_MS, &inst_ptr->instance.heartbeat_interval_ms) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_HEARTBEAT_INTERVAL_MS, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_VOTE_SECS, &inst_ptr->instance.vote_secs) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_VOTE_SECS, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_SHUTDOWN_NOTICE_SECS, &inst_ptr->instance.shutdown_notice_secs) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_SHUTDOWN_NOTICE_SECS, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_SUSPEND_NOTICE_SECS, &inst_ptr->instance.suspend_notice_secs) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_SUSPEND_NOTICE_SECS, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_RESUME_NOTICE_SECS, &inst_ptr->instance.resume_notice_secs) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_RESUME_NOTICE_SECS, jobj_msg); - return FAIL; - } - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_RESTART_SECS, &inst_ptr->instance.restart_secs) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_RESTART_SECS, jobj_msg); - return FAIL; - } - - inst_ptr->instance.name = instance_name; - - /* Override the unused 'inst' name with an abbreviated version of the instance uuid - * cgcs.heartbeat.1f0bc3e3-efbe-48b8-9688-4821fc0ff83c.sock - * - * */ - if ( inst_ptr->instance.uuid.length() >= (24+12) ) - inst_ptr->instance.inst = inst_ptr->instance.uuid.substr(24,12); - - string name = log_prefix(&inst_ptr->instance).c_str() ; - - ilog ("%s 'init' message ; sending 'init_ack' (ver:%d.%d)\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.version, - inst_ptr->instance.revision ); - - inst_ptr->instance.heartbeat_challenge = rand(); - - - /* Set the unhealthy corrective action to unknown by default */ - inst_ptr->instance.unhealthy_corrective_action = GUEST_HEARTBEAT_MSG_ACTION_UNKNOWN ; - - ilog ("%s corrective_action = %s\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.corrective_action.c_str() ); - - ilog ("%s Interval : %4d msec\n",name.c_str(), inst_ptr->instance.heartbeat_interval_ms); - - /* auto correct an interval that is too small */ - if ( inst_ptr->instance.heartbeat_interval_ms < (uint32_t)daemon_get_cfg_ptr()->hbs_pulse_period ) - { - wlog ("%s cannot have an interval of zero seconds\n", - log_prefix(&inst_ptr->instance).c_str()); - - wlog ("%s ... auto correcting to %d msecs\n", - log_prefix(&inst_ptr->instance).c_str(), - daemon_get_cfg_ptr()->hbs_pulse_period); - - inst_ptr->instance.heartbeat_interval_ms = daemon_get_cfg_ptr()->hbs_pulse_period ; - } - - ilog ("%s Vote TO : %4d secs\n",name.c_str(), inst_ptr->instance.vote_secs); - inst_ptr->instance.vote_to_str = time_in_secs_to_str(inst_ptr->instance.vote_secs) ; - - ilog ("%s Shutdown : %4d secs\n", name.c_str(), inst_ptr->instance.shutdown_notice_secs); - inst_ptr->instance.shutdown_to_str = time_in_secs_to_str (inst_ptr->instance.shutdown_notice_secs); - - ilog ("%s Suspend : %4d secs\n", name.c_str(), inst_ptr->instance.suspend_notice_secs); - inst_ptr->instance.suspend_to_str = time_in_secs_to_str (inst_ptr->instance.suspend_notice_secs); - - ilog ("%s Resume : %4d secs\n", name.c_str(), inst_ptr->instance.resume_notice_secs); - inst_ptr->instance.resume_to_str = time_in_secs_to_str (inst_ptr->instance.resume_notice_secs); - - ilog ("%s Restart : %4d secs\n", name.c_str(), inst_ptr->instance.restart_secs); - inst_ptr->instance.restart_to_str = time_in_secs_to_str(inst_ptr->instance.restart_secs); - - /* cancel the init timer since we already got the init */ - if ( inst_ptr->init_timer.tid ) - mtcTimer_stop ( inst_ptr->init_timer ) ; - - /************************************************************* - * - * Send INIT ACK right away followed by the first Challenge. - * - * Cannot allow the FSM to run or we might see a - * race condition with another INIT messages that come after. - * - *************************************************************/ - response = guestSvrMsg_hdr_init(inst_ptr->instance.uuid , GUEST_HEARTBEAT_MSG_INIT_ACK); - response.append ("\""); - response.append (GUEST_HEARTBEAT_MSG_INVOCATION_ID); - response.append ("\":"); - response.append (int_to_string(inst_ptr->instance.invocation_id)); - response.append ("}\n"); - - inst_ptr->instance.message_count = 0 ; - - /* Send message to the vm through the libvirt channel */ - ilog("%s sending 'init_ack' invocation_id:%d, msg: %s\n", name.c_str(), - inst_ptr->instance.invocation_id, response.c_str()); - - get_instInv_ptr()->write_inst (&inst_ptr->instance, response.c_str(), response.length()); - - /* Send a challenge right away */ - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_response ) ; - inst_ptr->instance.heartbeat.b2b_misses = 0 ; - inst_ptr->instance.heartbeat.failed = false ; - send_challenge ( inst_ptr ) ; - inst_ptr->messageStage = INST_MESSAGE__RECEIVE ; - } - } - else if ( !inst_ptr->instance.msg_type.compare(GUEST_HEARTBEAT_MSG_ACTION_RESPONSE) ) - { - uint32_t invocation_id; - const char *msg = json_object_to_json_string_ext(jobj_msg, JSON_C_TO_STRING_PLAIN); - ilog ("%s received action response message: %s\n", - log_prefix(&inst_ptr->instance).c_str(), msg ); - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_INVOCATION_ID, &invocation_id) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_INVOCATION_ID, jobj_msg); - return FAIL; - } - - if ( invocation_id != inst_ptr->instance.invocation_id ) - { - wlog ("%s invocation id mismatch (%x:%x) - dropping response\n", - log_prefix(&inst_ptr->instance).c_str(), - invocation_id, - inst_ptr->instance.invocation_id ); - string log_err = "Invocation id mismatch. Received: "; - log_err.append(int_to_string(invocation_id)); - log_err.append(" expect: "); - log_err.append(int_to_string(inst_ptr->instance.invocation_id)); - send_client_msg_nack(&inst_ptr->instance, log_err); - } - else - { - string event_type; - string notification_type; - string vote_result; - string reject_reason; - - if(jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_EVENT_TYPE, &event_type) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_EVENT_TYPE, jobj_msg); - return FAIL; - } - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_NOTIFICATION_TYPE, ¬ification_type) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_NOTIFICATION_TYPE, jobj_msg); - return FAIL; - } - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_VOTE_RESULT, &vote_result) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_VOTE_RESULT, jobj_msg); - return FAIL; - } - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_LOG_MSG, &reject_reason) != PASS) - { - handle_parse_failure(inst_ptr, GUEST_HEARTBEAT_MSG_LOG_MSG, jobj_msg); - return FAIL; - } - - send_vote_notify_resp (get_ctrl_ptr()->hostname, - inst_ptr->instance.uuid, - notification_type, - event_type, - vote_result, - reject_reason); - - inst_ptr->monitorStage = INST_MONITOR__STEADY ; - - _schedule_init_timer ( event_type , inst_ptr->init_timer ); - - // if pause-accept or pause-complete) - if (!event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_PAUSE) && - (!vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_ACCEPT) || - !vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_COMPLETE)) ) - { - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_init ) ; - } - voteStateChange ( &inst_ptr->instance, hbs_server_waiting_init ) ; - - // cancel the vote timer - if ( inst_ptr->vote_timer.tid ) - mtcTimer_stop ( inst_ptr->vote_timer ); - inst_ptr->vote_timer.ring = false ; - } - } - else if ( !inst_ptr->instance.msg_type.compare(GUEST_HEARTBEAT_MSG_EXIT) ) - { - const char *msg = json_object_to_json_string_ext(jobj_msg, JSON_C_TO_STRING_PLAIN); - ilog ("%s received client exit request: %s\n", - log_prefix(&inst_ptr->instance).c_str(), msg ); - - /* Prevent a heartbeat loss in the case of a graceful exit - * by moving into the waiting_init state */ - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_init ) ; - - hbStatusChange ( &inst_ptr->instance, false ); - } - else - { - elog ("%s unsupported message type: %s.\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.msg_type.c_str()); - - string log_err = "unsupported message type: "; - log_err.append(inst_ptr->instance.msg_type); - send_client_msg_nack(&inst_ptr->instance, log_err); - } - json_object_put(jobj_msg); - } - break ; - } - - default: - { - elog ("Unsupported stage (%d)\n", inst_ptr->messageStage ); - } - } - return (rc) ; -} - -/************************************************************************************* - * - * Name : send_challenge - * - * Description: Transmit a heartbeat challenge to he specified VM - * and start the timoeut timer. - * - **************************************************************************************/ -int guestInstClass::send_challenge ( struct guestInstClass::inst * inst_ptr ) -{ - size_t bytes_sent ; - - string message = guestSvrMsg_hdr_init(inst_ptr->instance.uuid , GUEST_HEARTBEAT_MSG_CHALLENGE); - - beatStateChange ( &inst_ptr->instance, hbs_server_waiting_response ); - - inst_ptr->instance.heartbeat_challenge = rand(); - - message.append ("\""); - message.append (GUEST_HEARTBEAT_MSG_HEARTBEAT_CHALLENGE); - message.append ("\":"); - message.append (int_to_string(inst_ptr->instance.heartbeat_challenge)); - message.append ("}\n"); - - /* Send message to the vm through the libvirt channel */ - bytes_sent = write_inst (&inst_ptr->instance, message.c_str(), message.length()); - - /* The write_inst will report an error log. - * This one is only to report a partial message send. - */ - if (( bytes_sent > 0) && ( bytes_sent != message.length())) - { - wlog ("%s only sent %ld of %ld bytes\n", - log_prefix(&inst_ptr->instance).c_str(), - bytes_sent, message.length() ); - } - - /* Waiting on a response now */ - inst_ptr->instance.heartbeat.waiting = true ; - - start_monitor_timer ( inst_ptr ) ; - - if ( daemon_get_cfg_ptr()->debug_work ) - printf ("_"); - - return (PASS); -} - -/************************************************************************************* - * - * Name : send_vote_notify - * - * Description: Send a voting or notification message to GuestClient on VM - * and start the timeout timer. - * - **************************************************************************************/ -int guestInstClass::send_vote_notify ( string uuid ) -{ - struct guestInstClass::inst * inst_ptr = getInst(uuid); - size_t bytes_sent ; - uint32_t timeout_ms; - - string message = guestSvrMsg_hdr_init(inst_ptr->instance.uuid , GUEST_HEARTBEAT_MSG_ACTION_NOTIFY); - - voteStateChange ( &inst_ptr->instance, hbs_client_waiting_shutdown_response ); - - - if ( !inst_ptr->instance.notification_type.compare(GUEST_HEARTBEAT_MSG_NOTIFY_REVOCABLE) ) - { - timeout_ms = inst_ptr->instance.vote_secs * 1000; - } - else - { - timeout_ms = inst_ptr->instance.vote_secs ; - if (!inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_STOP) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_REBOOT)) - { - timeout_ms = inst_ptr->instance.shutdown_notice_secs * 1000 ; - - } else if (!inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_SUSPEND) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_PAUSE) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_RESIZE_BEGIN) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_LIVE_MIGRATE_BEGIN) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_COLD_MIGRATE_BEGIN) ) { - timeout_ms = inst_ptr->instance.suspend_notice_secs * 1000 ; - - } else if (!inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_UNPAUSE) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_RESUME) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_RESIZE_END) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_LIVE_MIGRATE_END) || - !inst_ptr->instance.event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_COLD_MIGRATE_END) ) { - timeout_ms = inst_ptr->instance.resume_notice_secs * 1000 ; - } else { - wlog ("%s unsupported event type (%s) defaulting to 'vote' timeout of %d secs\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.event_type.c_str(), - inst_ptr->instance.vote_secs); - } - } - - dlog ("%s event_type:%s notification_type:%s invocation_id:%d timeout_ms:%d\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.event_type.c_str(), - inst_ptr->instance.notification_type.c_str(), - inst_ptr->instance.invocation_id, - timeout_ms); - - message.append ("\""); - message.append (GUEST_HEARTBEAT_MSG_INVOCATION_ID); - message.append ("\":"); - message.append (int_to_string(inst_ptr->instance.invocation_id)); - message.append (",\""); - message.append (GUEST_HEARTBEAT_MSG_EVENT_TYPE); - message.append ("\":\""); - message.append (inst_ptr->instance.event_type); - message.append ("\",\""); - message.append (GUEST_HEARTBEAT_MSG_NOTIFICATION_TYPE); - message.append ("\":\""); - message.append (inst_ptr->instance.notification_type); - message.append ("\",\""); - message.append (GUEST_HEARTBEAT_MSG_TIMEOUT_MS); - message.append ("\":"); - message.append (int_to_string(timeout_ms)); - message.append ("}\n"); - - ilog("%s send_vote_notify message=%s\n", - log_prefix(&inst_ptr->instance).c_str(), message.c_str()); - - /* Send message to the vm through the libvirt channel */ - bytes_sent = write_inst (&inst_ptr->instance, message.c_str(), message.length()); - if ( bytes_sent != message.length() ) - { - wlog ("%s only sent %ld of %ld bytes\n", inst_ptr->instance.inst.c_str(), - bytes_sent, message.length() ); - } - - if ( inst_ptr->vote_timer.tid ) - mtcTimer_stop ( inst_ptr->vote_timer ); - mtcTimer_start ( inst_ptr->vote_timer, guestTimer_handler, inst_ptr->instance.vote_secs ); - - dlog("%s timer started for %d seconds\n", - log_prefix(&inst_ptr->instance).c_str(), - inst_ptr->instance.vote_secs); - - return (PASS); -} - -/************************************************************************************* - * - * Name : send_vote_notify_resp - * - * Description: Send response for voting or notification to GuestAgent - * - **************************************************************************************/ -int guestInstClass::send_vote_notify_resp ( char * hostname, string uuid, - string notification_type, - string event_type, - string vote_result, - string reject_reason) -{ - instInfo * instInfo_ptr = get_inst ( uuid ); - - if ( !instInfo_ptr ) - { - elog ("%s is unknown\n", uuid.c_str()); - return FAIL; - } - - if (!vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_ACCEPT) || - !vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_COMPLETE)) - { - // accept - ilog ("%s '%s' '%s' '%s'\n", - log_prefix(instInfo_ptr).c_str(), - notification_type.c_str(), - event_type.c_str(), - vote_result.c_str()); - - if (!vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_COMPLETE) && - !event_type.compare(GUEST_HEARTBEAT_MSG_EVENT_SUSPEND)) - { - instInfo_ptr->connected = false ; - hbStatusChange ( instInfo_ptr , false ); - } - } else if (!vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_REJECT)) { - ilog ("%s '%s' '%s' '%s' reason: %s\n", - log_prefix(instInfo_ptr).c_str(), - notification_type.c_str(), - event_type.c_str(), - vote_result.c_str(), - reject_reason.c_str()); - } else if (!vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_TIMEOUT)) { - ilog ("%s '%s' '%s' '%s'\n", - log_prefix(instInfo_ptr).c_str(), - notification_type.c_str(), - event_type.c_str(), - vote_result.c_str()); - } else if (!vote_result.compare(GUEST_HEARTBEAT_MSG_VOTE_RESULT_ERROR)) { - elog ("%s vote to '%s' returned error: %s\n", - log_prefix(instInfo_ptr).c_str(), - event_type.c_str(), - vote_result.c_str()); - } else { - elog ("%s vote to '%s' unknown vote response %s\n", - log_prefix(instInfo_ptr).c_str(), - event_type.c_str(), - vote_result.c_str()); - } - - string payload = "" ; - payload.append ("{\"hostname\":\""); - payload.append (hostname); - payload.append ("\", \"uuid\": \""); - payload.append (uuid.c_str()); - payload.append ("\", \"notification_type\": \""); - payload.append (notification_type); - payload.append ("\", \"event-type\": \""); - payload.append (event_type); - payload.append ("\", \"vote\": \""); - payload.append (vote_result); - payload.append ("\", \"reason\": \""); - payload.append (reject_reason); - payload.append ("\"}"); - - jlog ("%s Notification Event Payload: %s\n", log_prefix(instInfo_ptr).c_str(), payload.c_str()); - - send_to_guestAgent ( MTC_EVENT_VOTE_NOTIFY , payload.data()); - - return (PASS); -} - -/************************************************************************************* - * - * Name : send_client_msg_nack - * - * Description: Send failure response to GuestClient when fail to process the client message - * - **************************************************************************************/ -void guestInstClass::send_client_msg_nack ( instInfo * instInfo_ptr, - string log_err) -{ - size_t bytes_sent ; - - string message = guestSvrMsg_hdr_init(instInfo_ptr->uuid , GUEST_HEARTBEAT_MSG_NACK); - - message.append ("\""); - message.append (GUEST_HEARTBEAT_MSG_INVOCATION_ID); - message.append ("\":"); - message.append (int_to_string(instInfo_ptr->invocation_id)); - message.append (",\""); - message.append (GUEST_HEARTBEAT_MSG_LOG_MSG); - message.append ("\":\""); - message.append (log_err.c_str()); - message.append ("\"}\n"); - - ilog("%s send_client_msg_nack message=%s\n", - log_prefix(instInfo_ptr).c_str(), message.c_str()); - - /* Send message to the vm through the libvirt channel */ - bytes_sent = write_inst (instInfo_ptr, message.c_str(), message.length()); - if ( bytes_sent != message.length() ) - { - wlog ("%s only sent %ld of %ld bytes\n", instInfo_ptr->inst.c_str(), - bytes_sent, message.length() ); - } -} - -/************************************************************************************* - * - * Name : handle_parse_failure - * - * Description: Handle JSON parse failure - * - **************************************************************************************/ -void guestInstClass::handle_parse_failure ( struct guestInstClass::inst * inst_ptr, - const char *key, - struct json_object *jobj_msg) -{ - string log_err = "failed to parse "; - log_err.append(key); - elog("%s %s\n", log_prefix(&inst_ptr->instance).c_str(), log_err.c_str()); - send_client_msg_nack(&inst_ptr->instance, log_err); - /* pop_front() only deletes the internal copy of jobj_msg in the message_list. - The original object still needs to be released here */ - json_object_put(jobj_msg); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.cpp deleted file mode 100644 index c5b4fde3..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.cpp +++ /dev/null @@ -1,784 +0,0 @@ -/* - * Copyright (c) 2013-2018 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Heartbeat Server Daemon on Compute - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for hostent */ -#include -#include -#include -#include -#include -#include -#include /* for close and usleep */ -#include /* for realtime scheduling api */ -#include - -using namespace std; - -#include "nodeBase.h" -#include "daemon_ini.h" /* Ini Parser Header */ -#include "daemon_common.h" /* Common definitions and types for daemons */ -#include "daemon_option.h" /* Common options for daemons */ -#include "nodeUtil.h" /* for ... common utilities */ -#include "jsonUtil.h" /* for ... jason utilities */ -#include "nodeTimers.h" /* for ... maintenance timers */ -#include "nodeMacro.h" /* for ... CREATE_NONBLOCK_INET_UDP_RX_SOCKET */ -#include "nodeEvent.h" /* for ... set_inotify_watch, set_inotify_close */ -#include "guestBase.h" -#include "guestInstClass.h" /* for ... guestUtil_inst_init */ -#include "guestUtil.h" /* for ... guestUtil_inst_init */ -#include "guestSvrUtil.h" /* for ... hb_get_message_type_name */ -#include "guestSvrMsg.h" /* for ... this module header */ - -extern void hbStatusChange ( instInfo * instInfo_ptr, bool status ); -extern void beatStateChange ( instInfo * instInfo_ptr , hb_state_t newState ); - -/***************************************************************************** - * - * Name : guestSvrMsg_hdr_init - * - * Purpose: Initialize the message header. Example output: - * {"version":2,"revision":1,"msg_type":"init","sequence":29, - * The rest of the message should be appended to it. - * - *****************************************************************************/ - -string guestSvrMsg_hdr_init (string channel, string msg_type) -{ - instInfo * instInfo_ptr = get_instInv_ptr()->get_inst (channel); - - string msg = "\n{\""; - msg.append(GUEST_HEARTBEAT_MSG_VERSION); - msg.append("\":"); - msg.append(int_to_string(GUEST_HEARTBEAT_MSG_VERSION_CURRENT)); - msg.append(",\""); - msg.append(GUEST_HEARTBEAT_MSG_REVISION); - msg.append("\":"); - msg.append(int_to_string(GUEST_HEARTBEAT_MSG_REVISION_CURRENT)); - msg.append(",\""); - msg.append(GUEST_HEARTBEAT_MSG_MSG_TYPE); - msg.append("\":\""); - msg.append(msg_type); - msg.append("\",\""); - msg.append(GUEST_HEARTBEAT_MSG_SEQUENCE); - msg.append("\":"); - msg.append(int_to_string(++(instInfo_ptr->sequence))); - msg.append(","); - - // store msg_type in instance structure so that it is available to handle timeout - instInfo_ptr->msg_type = msg_type; - return msg; -} - -/** - * Manages the fault reporting state - * - returns current reporting state - * */ -bool manage_reporting_state ( instInfo * instInfo_ptr, string state) -{ - if (!state.compare("enabled")) - { - if ( instInfo_ptr->heartbeat.reporting == false ) - { - ilog ("%s heartbeat reporting '%s' by guestAgent\n", - log_prefix(instInfo_ptr).c_str(), - state.c_str()); - - instInfo_ptr->heartbeat.reporting = true ; - instInfo_ptr->message_count = 0 ; - } - } - else - { - if ( instInfo_ptr->heartbeat.reporting == true ) - { - ilog ("%s heartbeat reporting '%s' by guestAgent\n", - log_prefix(instInfo_ptr).c_str(), - state.c_str()); - - instInfo_ptr->heartbeat.reporting = false ; - instInfo_ptr->message_count = 0 ; - hbStatusChange ( instInfo_ptr, false) ; /* heartbeating is now false */ - beatStateChange ( instInfo_ptr, hbs_server_waiting_init ) ; - } - } - - return instInfo_ptr->heartbeat.reporting ; -} - -/***************************************************************************** - * - * Name : guestAgent_qry_handler - * - * Purpose: Loop over all the instances and return their uuid, hostname, - * reporting state, heartbneating status and timeout values. - * - * { "hostname":"compute-1", "instances": [{"uuid":"","heartbeat":"", status":"}, timeouts ...]} - * - *****************************************************************************/ -int guestInstClass::guestAgent_qry_handler ( void ) -{ - int rc = PASS ; - - /* check for empty list condition */ - if ( inst_head ) - { - struct inst * inst_ptr = static_cast(NULL) ; - for ( inst_ptr = inst_head ; ; inst_ptr = inst_ptr->next ) - { - string payload = guestUtil_set_inst_info ( get_ctrl_ptr()->hostname , &inst_ptr->instance ); - jlog ("%s Query Instance Response:%ld:%s\n", - log_prefix(&inst_ptr->instance).c_str(), - payload.size(), - payload.c_str() ); - - if (( rc=send_to_guestAgent ( MTC_CMD_QRY_INST, payload.data())) != PASS ) - { - wlog ("%s failed to send query instance response to guestAgent\n", - log_prefix(&inst_ptr->instance).c_str()); - } - - /* Deal with exit case */ - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - { - break ; - } - } - } - return (rc); -} - -/***************************************************************************** - * - * Name : recv_from_guestAgent - * - * Purpose: Handle guestAgent commands - * - * MTC_EVENT_LOOPBACK - * MTC_CMD_QRY_INST - * MTC_CMD_DEL_INST - * MTC_CMD_MOD_INST - * MTC_CMD_ADD_INST - * MTC_CMD_MOD_HOST - * - * ***************************************************************************/ -int recv_from_guestAgent ( unsigned int cmd, char * buf_ptr ) -{ - int rc = PASS ; - - mlog1 ("Cmd:%x - %s\n", cmd, buf_ptr); - - if ( cmd == MTC_EVENT_LOOPBACK ) - { - /* TODO: Send message back */ - return (rc) ; - } - else if ( cmd == MTC_CMD_QRY_INST ) - { - if ( ( rc = get_instInv_ptr()->qry_inst ()) != PASS ) - { - elog ("failed to send hosts instance info\n"); - } - return (rc) ; - } - else if ( cmd == MTC_CMD_VOTE_INST - || cmd == MTC_CMD_NOTIFY_INST ) - { - string source; - string uuid; - string event; - - rc = FAIL_KEY_VALUE_PARSE ; /* default to parse error */ - - if (( rc = jsonUtil_get_key_val ( buf_ptr, "source", source )) != PASS) - { - elog ("failed to extract 'source' (cmd:%x %s)\n", cmd , buf_ptr ); - } - else if (( rc = jsonUtil_get_key_val ( buf_ptr, "uuid", uuid )) != PASS) - { - elog ("failed to extract 'uuid' (cmd:%x %s)\n", cmd , buf_ptr); - } - else if (( rc = jsonUtil_get_key_val ( buf_ptr, "event", event )) != PASS) - { - elog ("failed to extract 'event' key (cmd:%x %s)\n", cmd , buf_ptr); - } - else - { - - // send message to guest Client - instInfo * instInfo_ptr = get_instInv_ptr()->get_inst(uuid); - if ( instInfo_ptr ) - { - /* If this is a resume then we need to reconnect to the channel */ - if ( !event.compare(GUEST_HEARTBEAT_MSG_EVENT_RESUME) ) - { - /* issue a reconnect if we are not connected the hartbeating has not started */ - if (( instInfo_ptr->connected == false ) || - ( instInfo_ptr->heartbeating == false )) - { - // instInfo_ptr->connect_wait_in_secs = 10 ; - get_instInv_ptr()->reconnect_start ( instInfo_ptr->uuid.data() ); - } - } - - instInfo_ptr->event_type = event; - if (MTC_CMD_VOTE_INST == cmd) - { - // for voting - instInfo_ptr->notification_type = GUEST_HEARTBEAT_MSG_NOTIFY_REVOCABLE ; - - ilog ("%s sending revocable '%s' vote\n", - log_prefix(instInfo_ptr).c_str(), - event.c_str()); - } - else - { - // for notification - instInfo_ptr->notification_type = GUEST_HEARTBEAT_MSG_NOTIFY_IRREVOCABLE ; - - ilog ("%s sending irrevocable '%s' notify\n", - log_prefix(instInfo_ptr).c_str(), - event.c_str()); - } - get_instInv_ptr()->send_vote_notify(uuid) ; - rc = PASS ; - } - else - { - wlog ("%s is unknown\n", uuid.c_str()); - } - } - } - else - { - string source ; - string uuid ; - string service ; - string state ; - - rc = FAIL_KEY_VALUE_PARSE ; /* default to parse error */ - - if (( rc = jsonUtil_get_key_val ( buf_ptr, "source", source )) != PASS) - { - elog ("failed to extract 'source' (cmd:%x %s)\n", cmd , buf_ptr ); - } - else if (( rc = jsonUtil_get_key_val ( buf_ptr, "uuid", uuid )) != PASS) - { - elog ("failed to extract 'uuid' (cmd:%x %s)\n", cmd , buf_ptr); - } - else if (( rc = jsonUtil_get_key_val ( buf_ptr, "service", service )) != PASS) - { - elog ("failed to extract 'service' key (cmd:%x %s)\n", cmd , buf_ptr); - } - else if (( rc = jsonUtil_get_key_val ( buf_ptr, "state", state )) != PASS) - { - elog ("failed to extract 'state' (cmd:%x %s)\n", cmd , buf_ptr ); - } - else - { - rc = RETRY ; - switch ( cmd ) - { - case MTC_CMD_DEL_INST: - { - ilog ("%s delete\n", uuid.c_str()); - - if ( get_instInv_ptr()->del_inst( uuid ) == PASS ) - { - rc = PASS ; - } - else - { - dlog ("%s delete failed ; uuid lookup\n", uuid.c_str()); - rc = FAIL_NOT_FOUND ; - } - if (daemon_get_cfg_ptr()->debug_level ) - get_instInv_ptr()->print_instances (); - break ; - } - case MTC_CMD_ADD_INST: - case MTC_CMD_MOD_INST: - { - instInfo * instInfo_ptr = get_instInv_ptr()->get_inst ( uuid ); - if ( instInfo_ptr ) - { - manage_reporting_state ( instInfo_ptr, state ); - rc = PASS ; - } - - /* if true then the current channel was not found and we need to add it */ - if ( rc == RETRY ) - { - instInfo instance ; - guestUtil_inst_init (&instance); - - instance.uuid = uuid ; - ilog ("%s add with %s reporting %s\n", - uuid.c_str(), - service.c_str(), - state.c_str()); - - get_instInv_ptr()->add_inst ( uuid, instance ); - instInfo * instInfo_ptr = get_instInv_ptr()->get_inst ( uuid ); - manage_reporting_state ( instInfo_ptr, state ); - } - if (daemon_get_cfg_ptr()->debug_level ) - get_instInv_ptr()->print_instances(); - - break ; - } - case MTC_CMD_MOD_HOST: - { - guestInstClass * obj_ptr = get_instInv_ptr() ; - string reporting_state = "" ; - rc = jsonUtil_get_key_val ( buf_ptr, "heartbeat", reporting_state ) ; - if ( rc != PASS) - { - elog ("failed to extract heartbeat reporting state (rc=%d)\n", rc ); - wlog ("... disabling 'heartbeat' fault reporting due to error\n"); - obj_ptr->reporting = false ; - rc = FAIL_JSON_PARSE ; - } - else if ( !reporting_state.compare("enabled") ) - { - ilog ("Enabling host level 'heartbeat' fault reporting\n"); - obj_ptr->reporting = true ; - } - else - { - ilog ("Disabling host level 'heartbeat' fault reporting\n"); - obj_ptr->reporting = false ; - } - break ; - } - default: - { - elog ("unsupported command (%x)\n", cmd ); - } - } - } - } - return (rc); -} - -/**************************************************************************** - * - * Name : send_to_guestAgent - * - * Purpose : Send a command and buffer to the guestAgent - * - * Description: If the guestAgent IP is not known the message is dropped - * and a retry is returned. Otherwise the supplied message is - * sent to the guestAgent running on the controller. - * - * **************************************************************************/ -int send_to_guestAgent ( unsigned int cmd, const char * buf_ptr ) -{ - int bytes = 0; - - ctrl_type * ctrl_ptr = get_ctrl_ptr () ; - - int rc = PASS ; - mtc_message_type mtc_cmd ; - memset (&mtc_cmd,0,sizeof(mtc_message_type)); - - memcpy ( &mtc_cmd.buf[0], buf_ptr, strlen(buf_ptr)); - bytes = sizeof(mtc_message_type) ; - - if ( ctrl_ptr->address_peer.empty()) - { - mlog2 ("controller address unknown ; dropping message (%x:%s)", cmd , buf_ptr ); - return RETRY ; - } - - mlog1 ("Sending: %s:%d Cmd:%x:%s\n", ctrl_ptr->address_peer.c_str(), ctrl_ptr->sock.agent_rx_port, cmd, buf_ptr ); - - mtc_cmd.cmd = cmd ; - - /* rc = message size */ - rc = ctrl_ptr->sock.server_tx_sock->write((char *)&mtc_cmd, bytes,ctrl_ptr->address_peer.c_str()); - - if ( 0 > rc ) - { - elog("failed to send (%d:%m)\n", errno ); - rc = FAIL_SOCKET_SENDTO ; - } - else - { - mlog1 ("Transmit to %14s port %d\n", - ctrl_ptr->address_peer.c_str(), - ctrl_ptr->sock.server_tx_sock->get_dst_addr()->getPort()); - print_mtc_message ( &mtc_cmd ); - rc = PASS ; - } - - return (rc); -} - -/********************************************************************************* - * - * Name : write_inst (guestInstClass::public) - * - * Purpose: Send a message to the specified VM instance. - * - *********************************************************************************/ -ssize_t guestInstClass::write_inst ( instInfo * instInfo_ptr, - const char * message, - size_t size) -{ - string name = log_prefix(instInfo_ptr); - - errno = 0 ; - size_t len = write ( instInfo_ptr->chan_fd, message, size ); - if ( len != size ) - { - if ( errno ) - { - wlog_throttled ( instInfo_ptr->failure_count, 100, - "%s failed to send '%s' (seq:%x) (%d:%m)\n", name.c_str(), - instInfo_ptr->msg_type.c_str(), - instInfo_ptr->sequence, errno ); - - if ( errno == EPIPE ) - { - instInfo_ptr->connected = false ; - - instInfo_ptr->connect_wait_in_secs = DEFAULT_CONNECT_WAIT ; - get_instInv_ptr()->reconnect_start ( instInfo_ptr->uuid.data() ); - } - - len = 0 ; - } - else - { - wlog_throttled ( instInfo_ptr->failure_count, 100, - "%s send '%s' (seq:%x) (len:%ld)\n", name.c_str(), - instInfo_ptr->msg_type.c_str(), - instInfo_ptr->sequence, len); - } - } - else - { - instInfo_ptr->failure_count = 0 ; - mlog("%s send '%s' (seq:%x)\n", name.c_str(), - instInfo_ptr->msg_type.c_str(), - instInfo_ptr->sequence ); - } - return (len); -} - -/********************************************************************************* - * - * Name : process_msg (guestInstClass::private) - * - * Purpose : process delimited message - * - *********************************************************************************/ -void guestInstClass::process_msg(json_object *jobj_msg, - struct guestInstClass::inst * inst_ptr) -{ - int version; - string msg_type; - string log_err = "failed to parse "; - guestInstClass * obj_ptr = get_instInv_ptr(); - - //parse incoming msg - if (jobj_msg == NULL) - { - wlog("%s\n", log_err.c_str()); - return; - } - - if (jsonUtil_get_int(jobj_msg, GUEST_HEARTBEAT_MSG_VERSION, &version) != PASS) - { - // fail to parse the version - log_err.append(GUEST_HEARTBEAT_MSG_VERSION); - elog("%s\n", log_err.c_str()); - obj_ptr->send_client_msg_nack(&inst_ptr->instance, log_err); - json_object_put(jobj_msg); - return; - } - - if ( version < GUEST_HEARTBEAT_MSG_VERSION_CURRENT) - { - char log_err_str[100]; - sprintf(log_err_str, "Bad version: %d, expect version: %d", - version, GUEST_HEARTBEAT_MSG_VERSION_CURRENT); - elog("%s\n", log_err_str); - log_err = log_err_str; - obj_ptr->send_client_msg_nack(&inst_ptr->instance, log_err); - json_object_put(jobj_msg); - return; - } - - if (jsonUtil_get_string(jobj_msg, GUEST_HEARTBEAT_MSG_MSG_TYPE, &msg_type) != PASS) - { - // fail to parse the msg_type - log_err.append(GUEST_HEARTBEAT_MSG_MSG_TYPE); - elog("%s\n", log_err.c_str()); - obj_ptr->send_client_msg_nack(&inst_ptr->instance, log_err); - json_object_put(jobj_msg); - return; - } - - /* Enqueue the message to its instance message list */ - inst_ptr->message_list.push_back(jobj_msg); -} - -/********************************************************************************* - * - * Name : parser (guestInstClass::private) - * - * Purpose : parse message segments and feed valid message to process_msg - * - *********************************************************************************/ -void guestInstClass::parser(char *buf, - ssize_t len, - json_tokener* tok, - int newline_found, - struct guestInstClass::inst * inst_ptr) -{ - json_object *jobj = json_tokener_parse_ex(tok, buf, len); - enum json_tokener_error jerr = json_tokener_get_error(tok); - - if (jerr == json_tokener_success) { - process_msg(jobj, inst_ptr); - return; - } - - else if (jerr == json_tokener_continue) { - // partial JSON is parsed , continue to read from socket. - if (newline_found) { - // if newline was found in the middle of the buffer, the message - // should be completed at this point. Throw out incomplete message - // by resetting tokener. - json_tokener_reset(tok); - } - } - else - { - // parsing error - json_tokener_reset(tok); - } -} - -/********************************************************************************* - * - * Name : handle_virtio_serial_msg (guestInstClass::private) - * - * Purpose : handle delimitation and assembly of message stream - * - * Description: Multiple messages from the host can be bundled together into a - * single "read" so we need to check message boundaries and handle - * breaking the message apart. Assume a valid message does not - * contain newline '\n', and newline is added to the beginning and - * end of each message by the sender to delimit the boundaries. - * - *********************************************************************************/ -void guestInstClass::handle_virtio_serial_msg( - char *buf, - ssize_t len, - json_tokener* tok, - struct guestInstClass::inst * inst_ptr) -{ - char *newline; - ssize_t len_head; - -next: - if (len <= 0) - return; - - // search for newline as delimiter - newline = (char *)memchr((char *)buf, '\n', len); - - if (newline) { - // split buffer to head and tail at the location of newline. - // feed the head to the parser and recursively process the tail. - len_head = newline-buf; - - // parse head - if (len_head > 0) - parser(buf, len_head, tok, 1, inst_ptr); - - // start of the tail: skip newline - buf += len_head+1; - // length of the tail: deduct 1 for the newline character - len -= len_head+1; - - // continue to process the tail. - goto next; - } - else { - parser(buf, len, tok, 0, inst_ptr); - } -} - -/********************************************************************************* - * - * Name : readInst (guestInstClass::private) - * - * Purpose : try to receive a single message from all instances. - * - * Description: Each received message is enqueued into the associated - * instance's message queue. - * - *********************************************************************************/ - -int fail_count = 0 ; -void guestInstClass::readInst ( void ) -{ - int rc ; - std::list socks ; - - waitd.tv_sec = 0; - waitd.tv_usec = GUEST_SOCKET_TO; - - /* Initialize the master fd_set */ - FD_ZERO(&instance_readfds); - - socks.clear(); - - for ( struct inst * inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - if ( inst_ptr->instance.connected ) - { - socks.push_front( inst_ptr->instance.chan_fd ); - FD_SET(inst_ptr->instance.chan_fd, &instance_readfds); - } - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - - /* if there are no connected instance channels then exit */ - if ( socks.empty() ) - { - return ; - } - - /* Call select() and wait only up to SOCKET_WAIT */ - socks.sort(); - rc = select( socks.back()+1, &instance_readfds, NULL, NULL, &waitd); - - if (( rc <= 0 ) || ( rc > (int)socks.size())) - { - /* Check to see if the select call failed. */ - if ( rc > (int)socks.size()) - { - wlog_throttled ( fail_count, 100, "select return exceeds current file descriptors (%ld:%d)\n", - socks.size(), rc ); - } - /* ... but filter Interrupt signal */ - else if (( rc < 0 ) && ( errno != EINTR )) - { - wlog_throttled ( fail_count, 100, "socket select failed (%d:%m)\n", errno); - } - else - { - mlog3 ("nothing received from %ld instances; socket timeout (%d:%m)\n", socks.size(), errno ); - } - } - else - { - fail_count = 0 ; - mlog2 ("trying to receive for %ld instances\n", socks.size()); - - /* Search through all the instances for watched channels */ - for ( struct inst * inst_ptr = inst_head ; inst_ptr != NULL ; inst_ptr = inst_ptr->next ) - { - mlog2 ("%s monitoring %d\n", inst_ptr->instance.inst.c_str(), - inst_ptr->instance.chan_fd ); - - /* Service guestServer messages towards the local IP */ - if (FD_ISSET(inst_ptr->instance.chan_fd, &instance_readfds) ) - { - char buf[GUEST_HEARTBEAT_MSG_MAX_MSG_SIZE] ; - string name ; - - if( inst_ptr->instance.inst.empty() ) - name = inst_ptr->instance.uuid ; - else - name = inst_ptr->instance.inst ; - - struct json_tokener* tok = json_tokener_new(); - - for ( int i = 0; i < INST_MSG_READ_COUNT; i++ ) - { - rc = read ( inst_ptr->instance.chan_fd, buf, GUEST_HEARTBEAT_MSG_MAX_MSG_SIZE); - mlog2 ("%s read channel: bytes:%d, fd:%d\n", name.c_str(), rc,inst_ptr->instance.chan_fd ); - if ( rc < 0 ) - { - if ( errno == EINTR ) - { - wlog_throttled ( inst_ptr->instance.failure_count, 100, "%s EINTR\n", name.c_str()); - } - else if ( errno == ECONNRESET ) - { - wlog ("%s connection reset ... closing\n", name.c_str()); - - /* Close the connection if we get a 'connection reset by peer' errno */ - guestUtil_close_channel ( &inst_ptr->instance ); - - /* An element of the list is removed - need to break out */ - } - else if ( errno != EAGAIN ) - { - wlog_throttled ( inst_ptr->instance.failure_count, 100, "%s error (%d:%m)\n", name.c_str(), errno ); - } - else - { - mlog3 ("%s no more messages\n", name.c_str()); - } - break ; - } - else if ( rc == 0 ) - { - mlog3 ("%s no message\n" , name.c_str()); - break ; - } - else - { - if ( rc < GUEST_HEARTBEAT_MSG_MIN_MSG_SIZE ) - { - wlog_throttled ( inst_ptr->instance.failure_count, 100, - "%s message size %d is smaller than minimal %d; dropping\n", - name.c_str(), rc, GUEST_HEARTBEAT_MSG_MIN_MSG_SIZE); - } - else if ( inst_ptr->message_list.size() > MAX_MESSAGES ) - { - wlog_throttled ( inst_ptr->instance.failure_count, 100, - "%s message queue overflow (max:%d) ; dropping\n", - name.c_str(), MAX_MESSAGES ); - } - else - { - inst_ptr->instance.failure_count = 0 ; - mlog2 ("%s handling message buf: %s\n", name.c_str(), buf ); - handle_virtio_serial_msg(buf, rc, tok, inst_ptr); - } - } - } - json_tokener_free(tok); - } - if (( inst_ptr->next == NULL ) || ( inst_ptr == inst_tail )) - break ; - } - } -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.h b/mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.h deleted file mode 100644 index 9e61246d..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrMsg.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __INCLUDE_GUESTSVRMSG_H__ -#define __INCLUDE_GUESTSVRMSG_H__ - -/* - * Copyright (c) 2013-2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file - * Wind River CGTS Platform Guest Services "Messaging" Header - */ - -#include "guestBase.h" -#include "guestInstClass.h" /* for ... */ - -/* Send a command and buffer to the guestAgent */ -int send_to_guestAgent ( unsigned int cmd, - const char * buf_ptr ); - -int recv_from_guestAgent ( unsigned int cmd, char * buf_ptr ); - -string guestSvrMsg_hdr_init (string channel, string msg_type); - -#endif /* __INCLUDE_GUESTSVRMSG_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.cpp deleted file mode 100644 index 4ab15676..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.cpp +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (c) 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -#include -#include -#include -#include -#include -#include -#include - -using namespace std; - -#include "nodeBase.h" /* for ... */ -#include "nodeEvent.h" /* for ... inotify_event_queue_type and utils */ -#include "nodeTimers.h" /* maintenance timer utilities start/stop */ - -#include "guestInstClass.h" -#include "guestUtil.h" /* for ... guestUtil_inst_init */ -#include "guestSvrUtil.h" /* for ... this module header */ -#include "guestVirtio.h" /* for ... virtio_check_filename, - virtio_channel_add */ - -/***************************************************************************** - * - * Name : guestUtil_close_channel - * - * Purpose: Close the specified channel's virtio channel file descriptor. - * - ******************************************************************************/ -int guestUtil_close_channel ( instInfo * instInfo_ptr ) -{ - int rc = FAIL_NOT_FOUND ; - if ( instInfo_ptr ) - { - /* Free up the inotify watch */ - if ( instInfo_ptr->inotify_file_fd ) - { - dlog ("%s freeing inotify resource\n", log_prefix(instInfo_ptr).c_str() ); - set_inotify_close (instInfo_ptr->inotify_file_fd , - instInfo_ptr->inotify_file_wd ); - } - - if ( instInfo_ptr->chan_fd ) - { - dlog ("%s closing socket %d\n", - log_prefix(instInfo_ptr).c_str(), - instInfo_ptr->chan_fd ); - - close ( instInfo_ptr->chan_fd ); - instInfo_ptr->chan_fd = 0 ; - } - instInfo_ptr->chan_ok = false ; - instInfo_ptr->heartbeating = false ; - instInfo_ptr->connected = false ; - rc = PASS ; - } - return (rc); -} - -/***************************************************************************** - * - * Name : guestUtil_load_channels - * - * Purpose: Scan the Virtio Qemu directory looking for heartbeat channels - * into guests. - * - * Load those that are found into the control structure - * and setup messaging to them. - * - ******************************************************************************/ -void guestUtil_load_channels ( void ) -{ - DIR *dirp; - struct dirent entry; - struct dirent *result; - - dirp = opendir(QEMU_CHANNEL_DIR); - if (!dirp) - { - elog("failed to open %s directory (%d:%m)\n", QEMU_CHANNEL_DIR, errno); - } - else - { - dlog ("Searching %s directory\n", QEMU_CHANNEL_DIR); - while(0 == readdir_r(dirp, &entry, &result)) - { - if (!result) - break; - - if ( virtio_check_filename (result->d_name) ) - { - string channel = result->d_name ; - ilog ("%s found\n", channel.c_str() ); - if ( virtio_channel_add ( result->d_name ) == PASS ) - { - if ( virtio_channel_connect ( channel ) != PASS ) - { - string uuid = virtio_instance_name ( result->d_name ) ; - get_instInv_ptr()->reconnect_start ( uuid.data() ); - } - } - } - else - { - dlog3 ("ignoring file %s\n", result->d_name); - } - } - closedir(dirp); - } -} - -/***************************************************************************** - * - * Name : guestUtil_channel_search - * - * Purpose: Scan the Virtio Qemu directory looking for heartbeat channels - * into guests that are not currently provisioned. - * - ******************************************************************************/ -void guestUtil_channel_search ( void ) -{ - DIR *dirp; - struct dirent entry; - struct dirent *result; - - dirp = opendir(QEMU_CHANNEL_DIR); - if (!dirp) - { - elog("failed to open %s directory (%d:%m)\n", QEMU_CHANNEL_DIR, errno); - } - else - { - dlog ("Searching %s directory\n", QEMU_CHANNEL_DIR); - while(0 == readdir_r(dirp, &entry, &result)) - { - if (!result) - break; - - if ( virtio_check_filename (result->d_name) ) - { - if ( get_instInv_ptr()->get_inst ( virtio_instance_name (result->d_name).data()) == NULL ) - { - string channel = result->d_name ; - ilog ("found %s\n", channel.c_str() ); - virtio_channel_add ( result->d_name ); - virtio_channel_connect ( channel ); - } - } - } - closedir(dirp); - } -} - -/***************************************************************************** - * - * Name : guestUtil_inotify_events - * - * Purpose: Handle inotify events for the specified file descriptor. - * - *****************************************************************************/ -int guestUtil_inotify_events ( int fd ) -{ - string channel = "" ; - inotify_event_queue_type event_queue ; - int num = get_inotify_events ( fd , event_queue ) ; - - dlog3 ("inotify events queued: %d\n", num ); - - for ( int i = 0 ; i < num ; i++ ) - { - dlog2 ( "Event:%s for file:%s\n", get_inotify_event_str(event_queue.item[i].event), event_queue.item[i].name ); - - if ( event_queue.item[i].event == IN_CREATE ) - { - dlog1 ("%s CREATE event on %s\n", event_queue.item[i].name, QEMU_CHANNEL_DIR ); - if ( virtio_check_filename (&event_queue.item[i].name[0]) ) - { - dlog ("%s CREATE accepted\n", event_queue.item[i].name ); - channel = event_queue.item[i].name ; - if ( virtio_channel_add ( event_queue.item[i].name ) != PASS ) - { - elog ("%s failed to add detected channel\n", event_queue.item[i].name ); - } - } - } - else if ( event_queue.item[i].event == IN_DELETE ) - { - dlog1 ("%s DELETE event on %s\n", event_queue.item[i].name, QEMU_CHANNEL_DIR ); - if ( virtio_check_filename (&event_queue.item[i].name[0]) ) - { - dlog ("%s DELETE accepted\n", event_queue.item[i].name ); - channel = event_queue.item[i].name ; - get_instInv_ptr()->del_inst ( channel ); - } - else - { - dlog ("%s DELETE rejected\n", event_queue.item[i].name ); - } - } - else if ( event_queue.item[i].event == IN_MODIFY ) - { - dlog1 ("%s MODIFY event on %s\n", event_queue.item[i].name, QEMU_CHANNEL_DIR ); - if ( virtio_check_filename (&event_queue.item[i].name[0]) ) - { - dlog ("%s MODIFY accepted\n", event_queue.item[i].name ); - channel = event_queue.item[i].name ; - - /* if the channel was modified then we need - * - * 1. to close the channel, - * 2. delete it, - * 3. re-add it and - * 4. then repoen it. - * */ - get_instInv_ptr()->del_inst ( channel ); - - if ( virtio_channel_add ( event_queue.item[i].name ) != PASS ) - { - elog ("%s failed to re-add modified channel\n", channel.c_str()); - } - } - } - else - { - wlog ("%s UNKNOWN event on %s\n", event_queue.item[i].name, QEMU_CHANNEL_DIR ); - } - } - return (PASS); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.h b/mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.h deleted file mode 100644 index 01b79c24..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestSvrUtil.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __INCLUDE_GUESTSVRUTIL_H__ -#define __INCLUDE_GUESTSVRUTIL_H__ - -/* - * Copyright (c) 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -#include "guestBase.h" /* for ... instInfo */ - -int guestUtil_close_channel ( instInfo * instInfo_ptr ); -void guestUtil_load_channels ( void ); -int guestUtil_inotify_events ( int fd ); -void guestUtil_channel_search ( void ) ; - -#endif /* __INCLUDE_GUESTSVRUTIL_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestUtil.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestUtil.cpp deleted file mode 100644 index 6b72fc03..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestUtil.cpp +++ /dev/null @@ -1,330 +0,0 @@ -/* - * Copyright (c) 2013-2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -#include -#include -#include -using namespace std; - -#include "guestBase.h" -#include "guestUtil.h" -#include "guestClass.h" -#include "jsonUtil.h" - -#define MAX_NUM_LEN 64 -string time_in_secs_to_str ( time_t secs ) -{ - char int_str[MAX_NUM_LEN] ; - string temp ; - memset ( &int_str[0], 0, MAX_NUM_LEN ); - sprintf ( &int_str[0], "%ld" , secs ); - temp = int_str ; - return (temp); -} - -/***************************************************************************** - * - * Name : guestUtil_inst_init - * - * Purpose: Init the specified instance - * - *****************************************************************************/ -void guestUtil_inst_init ( instInfo * instance_ptr ) -{ - instance_ptr->uuid.clear(); /* Not used in the server */ - - instance_ptr->inotify_file_fd = 0 ; - instance_ptr->inotify_file_wd = 0 ; - - instance_ptr->chan_fd = 0 ; - instance_ptr->chan_ok = false ; - instance_ptr->connected = false ; /* Assume we have not connected to this channel */ - instance_ptr->heartbeating = false ; - - instance_ptr->heartbeat.provisioned = false ; - instance_ptr->heartbeat.reporting = false ; - instance_ptr->heartbeat.failures = 0 ; - - instance_ptr->heartbeat.state.clear() ; - - instance_ptr->hbState = hbs_server_waiting_init ; - instance_ptr->vnState = hbs_server_waiting_init ; - - instance_ptr->connect_count = 0 ; - instance_ptr->connect_retry_count = 0 ; - instance_ptr->select_count = 0 ; - instance_ptr->message_count = 0 ; - instance_ptr->health_count = 0 ; - instance_ptr->failure_count = 0 ; - instance_ptr->corrective_action_count = 0 ; - - instance_ptr->unhealthy_failure = false ; - - instance_ptr->heartbeat_interval_ms = HB_DEFAULT_INTERVAL_MS; - - instance_ptr->vote_secs = HB_DEFAULT_VOTE_MS/1000; - instance_ptr->vote_to_str = time_in_secs_to_str (instance_ptr->vote_secs); - - instance_ptr->shutdown_notice_secs = HB_DEFAULT_SHUTDOWN_MS/1000; - instance_ptr->shutdown_to_str = time_in_secs_to_str (instance_ptr->shutdown_notice_secs); - - instance_ptr->suspend_notice_secs = HB_DEFAULT_SUSPEND_MS/1000; - instance_ptr->suspend_to_str = time_in_secs_to_str (instance_ptr->suspend_notice_secs); - - instance_ptr->resume_notice_secs = HB_DEFAULT_RESUME_MS/1000; - instance_ptr->resume_to_str = time_in_secs_to_str (instance_ptr->resume_notice_secs); - - instance_ptr->restart_secs = HB_DEFAULT_RESTART_MS/1000; - instance_ptr->restart_to_str = time_in_secs_to_str(instance_ptr->restart_secs); - - instance_ptr->notification_type = GUEST_HEARTBEAT_MSG_NOTIFY_IRREVOCABLE ; - instance_ptr->event_type = GUEST_HEARTBEAT_MSG_EVENT_RESUME ; - - instance_ptr->corrective_action = GUEST_HEARTBEAT_MSG_ACTION_LOG ; - - instance_ptr->unhealthy_corrective_action = GUEST_HEARTBEAT_MSG_ACTION_UNKNOWN ; -} - -/***************************************************************************** - * - * Name : guestUtil_print_instance - * - * Purpose: Print a summary of the instances that are currently provisioned - * - *****************************************************************************/ -void guestUtil_print_instance ( instInfo * instInfo_ptr ) -{ - ilog ("%s Heartbeat: Prov-%c Reporting-%c Failures:%d\n", - instInfo_ptr->uuid.c_str(), - instInfo_ptr->heartbeat.provisioned ? 'Y':'n' , - instInfo_ptr->heartbeat.reporting ? 'Y':'n', - instInfo_ptr->heartbeat.failures); -} - -/***************************************************************************** - * - * Name : guestUtil_print_instances - * - * Purpose: Print a summary of the instances that are currently provisioned - * - *****************************************************************************/ -void guestUtil_print_instances ( ctrl_type * ctrl_ptr ) -{ - bool found = false ; - int i = 1 ; - - for ( ctrl_ptr->instance_list_ptr = ctrl_ptr->instance_list.begin(); - ctrl_ptr->instance_list_ptr != ctrl_ptr->instance_list.end(); - ctrl_ptr->instance_list_ptr++ ) - { - guestUtil_print_instance ( &(*ctrl_ptr->instance_list_ptr) ); - found = true ; - i++ ; - } - - if ( found == false ) - { - ilog ("no heartbeat channels provisioned\n"); - } -} - -string log_prefix ( instInfo * instInfo_ptr ) -{ - string prefix = "unknown" ; - - if ( instInfo_ptr ) - { - if ( instInfo_ptr->name.length() ) - { - if ( instInfo_ptr->name_log_prefix.empty() ) - { - instInfo_ptr->name_log_prefix = instInfo_ptr->inst ; - instInfo_ptr->name_log_prefix.append (" "); - instInfo_ptr->name_log_prefix.append (instInfo_ptr->name); - } - prefix = instInfo_ptr->name_log_prefix ; - } - else - { - if ( instInfo_ptr->uuid_log_prefix.empty() ) - { - instInfo_ptr->uuid_log_prefix = instInfo_ptr->uuid ; - } - prefix = instInfo_ptr->uuid_log_prefix ; - } - } - return (prefix); -} - -string guestUtil_set_inst_info ( string hostname , instInfo * instInfo_ptr ) -{ - /* Send one message per instance */ - string payload ("{\"hostname\":\""); - payload.append (hostname); - payload.append ("\",\"uuid\":\""); - payload.append (instInfo_ptr->uuid); - - /* Share the reporting state */ - payload.append ("\",\"reporting\":"); - if ( instInfo_ptr->heartbeat.reporting == true ) - payload.append ("\"enabled"); - else - payload.append ("\"disabled"); - - /* Share the heartbeating state */ - payload.append ("\",\"heartbeating\":"); - if ( instInfo_ptr->heartbeating == true ) - payload.append ("\"enabled"); - else - payload.append ("\"disabled"); - - payload.append ("\",\"repair-action\":\"" ); - if ( instInfo_ptr->unhealthy_failure == true ) - { - payload.append (instInfo_ptr->unhealthy_corrective_action); - } - else - { - payload.append (instInfo_ptr->corrective_action); - } - /* Add the restart timeout to the message */ - payload.append ("\",\"restart-to\":\""); - payload.append (instInfo_ptr->restart_to_str); - payload.append ("\",\"shutdown-to\":\""); - payload.append (instInfo_ptr->shutdown_to_str); - payload.append ("\",\"suspend-to\":\""); - payload.append (instInfo_ptr->suspend_to_str); - payload.append ("\",\"resume-to\":\""); - payload.append (instInfo_ptr->resume_to_str); - payload.append ("\",\"vote-to\":\""); - payload.append (instInfo_ptr->vote_to_str); - payload.append ("\""); - payload.append ("}"); - - jlog ("Payload: %s\n", payload.c_str()); - - return (payload); -} - -int guestUtil_get_inst_info ( string hostname, instInfo * instInfo_ptr, char * buf_ptr ) -{ - int rc = PASS ; - - string hostname_str = "" ; - string uuid = "" ; - string state = "" ; - string status = "" ; - string restart_to = "" ; - string resume_to = "" ; - string suspend_to = "" ; - string shutdown_to = "" ; - string vote_to = "" ; - string repair_str = "" ; - - if ( !buf_ptr ) - { - elog ( "null buffer\n" ); - return ( FAIL_NULL_POINTER ); - } - - jlog ("Payload: %s\n", buf_ptr ); - - int rc0 = jsonUtil_get_key_val ( buf_ptr, "hostname", hostname_str) ; - int rc1 = jsonUtil_get_key_val ( buf_ptr, "uuid", uuid ) ; - int rc2 = jsonUtil_get_key_val ( buf_ptr, "reporting", state ) ; - int rc3 = jsonUtil_get_key_val ( buf_ptr, "heartbeating", status ) ; - int rc4 = jsonUtil_get_key_val ( buf_ptr, "restart-to", restart_to ) ; - int rc5 = jsonUtil_get_key_val ( buf_ptr, "resume-to", resume_to ) ; - int rc6 = jsonUtil_get_key_val ( buf_ptr, "suspend-to", suspend_to ) ; - int rc7 = jsonUtil_get_key_val ( buf_ptr, "shutdown-to", shutdown_to ) ; - int rc8 = jsonUtil_get_key_val ( buf_ptr, "vote-to", vote_to ) ; - int rc9= jsonUtil_get_key_val ( buf_ptr, "repair-action",repair_str ) ; - if ( rc0 | rc1 | rc2 | rc3 | rc4 | rc5 | rc6 | rc7 | rc8 | rc9 ) - { - elog ("%s failed parse one or more key values (%d:%d:%d:%d:%d:%d:%d:%d:%d:%d)\n", - hostname.c_str(), rc0, rc1, rc2, rc3, rc4, rc5, rc6, rc7, rc8, rc9); - - rc = FAIL_KEY_VALUE_PARSE ; - } - else - { - if ( hostname.compare(hostname_str) ) - { - wlog ("%s hostname mismatch - loaded\n", hostname_str.c_str()); - } - - if ( instInfo_ptr ) - { - /* Update the reporting state */ - if ( !state.compare("enabled") ) - instInfo_ptr->heartbeat.reporting = true ; - else - instInfo_ptr->heartbeat.reporting = false ; - - /* update the heartbeating status */ - if ( !status.compare("enabled") ) - instInfo_ptr->heartbeating = true ; - else - instInfo_ptr->heartbeating = false ; - - instInfo_ptr->corrective_action = repair_str ; - - /* Update the intance timeout values */ - instInfo_ptr->restart_to_str = restart_to ; - instInfo_ptr->shutdown_to_str = shutdown_to ; - instInfo_ptr->resume_to_str = resume_to ; - instInfo_ptr->suspend_to_str = suspend_to ; - instInfo_ptr->vote_to_str = vote_to ; - } - else - { - wlog ("%s %s lookup failed\n", hostname.c_str(), uuid.c_str()); - rc = FAIL_INVALID_UUID ; - } - } - return (rc); -} - -const char* state_names[] = - { - "invalid", - "server_waiting_init", - "server_waiting_challenge", - "server_waiting_response", - "server_paused", - "server_nova_paused", - "server_migrating", - "server_corrective_action", - "client_waiting_init_ack", - "client_waiting_challenge", - "client_waiting_pause_ack", - "client_waiting_resume_ack", - "client_paused", - "client_waiting_shutdown_ack", - "client_waiting_shutdown_response", - "client_shutdown_response_recieved", - "client_exiting", - }; - -const char* hb_get_state_name ( hb_state_t s ) -{ - if (s >= hbs_state_max) - return "???"; - - return state_names[s]; -} - -/***************************************************************************** - * Convert integer to string - *****************************************************************************/ -string int_to_string(int number) -{ - ostringstream ostr; - ostr << number; - return ostr.str(); -} - diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestUtil.h b/mtce-common/cgts-mtce-common-1.0/guest/guestUtil.h deleted file mode 100644 index f1926f53..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestUtil.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef __INCLUDE_GUESTUTIL_H__ -#define __INCLUDE_GUESTUTIL_H__ - -/* - * Copyright (c) 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -#include "guestBase.h" /* for ... instInfo */ - -void guestUtil_inst_init ( instInfo * instance_ptr ); -void guestUtil_print_instances ( ctrl_type * ctrl_ptr ); -void guestUtil_print_instance ( instInfo * instInfo_ptr ); - -/* called in guestAgent */ -int guestUtil_get_inst_info ( string hostname, instInfo * instInfo_ptr, char * buf_ptr ); - -/* called in guestServer */ -string guestUtil_set_inst_info ( string hostname, instInfo * instInfo_ptr ); - - - -string log_prefix ( instInfo * instInfo_ptr ); -string time_in_secs_to_str ( time_t secs ); - -const char* hb_get_corrective_action_name( uint32_t a) ; // heartbeat_corrective_action_t a); -const char* hb_get_state_name (hb_state_t s); -// Convert integer to string -string int_to_string(int number); - - -#endif /* __INCLUDE_GUESTUTIL_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.cpp deleted file mode 100644 index 369ff9e3..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.cpp +++ /dev/null @@ -1,777 +0,0 @@ -/* - * Copyright (c) 2013, 2016 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - - /** - * @file Wind River CGTS Platform Guest Heartbeat REST API - * used to report heartbeat faults or query instance - * information from the VIM. - * - */ - -#ifdef __AREA__ -#undef __AREA__ -#endif -#define __AREA__ "vim" - -using namespace std; - -#include "nodeBase.h" /* for ... common definitions */ -#include "nodeUtil.h" /* for ... common utilities */ -#include "jsonUtil.h" /* for ... jsonUtil_get_key_val */ - -#include "guestUtil.h" /* for ... guestUtil_inst_init */ -#include "guestSvrUtil.h" /* for ... hb_get_corrective_action_name */ -#include "guestVimApi.h" /* for ... this module header */ - -#define URL_VIM_ADDRESS "127.0.0.1" -#define URL_VIM_INST_LABEL "/nfvi-plugins/v1/instances/" -#define URL_VIM_HOST_LABEL "/nfvi-plugins/v1/hosts/" - -#define VIM_EVENT_SIG "vimEvent" -#define VIM_SIG "vim" - -#define OPER__HOST_STATE_QUERY "host state query" -#define OPER__HOST_INST_QUERY "host inst query" -#define OPER__HOST_INST_FAIL "host inst fail" -#define OPER__HOST_INST_STATUS "host inst status" -#define OPER__HOST_INST_CHANGE "inst status change" -#define OPER__HOST_INST_NOTIFY "host inst notify" - - -/********************************************************************* - * - * Name : guestVimApi_handler - * - * Description: The Guest Heartbeat event request handler - * - *********************************************************************/ -void guestHostClass::guestVimApi_handler ( struct evhttp_request *req, void *arg ) -{ - string hostname = "unknown" ; - - guestHostClass * obj_ptr = get_hostInv_ptr(); - libEvent & event = obj_ptr->getEvent ( (struct event_base *)arg, hostname ); - if ( event.request == SERVICE_NONE ) - { - slog ("guest instance Lookup Failed (%p)\n", arg); - return ; - } - - /* Check for command timeout */ - if ( !req ) - { - dlog ("hostname=%s service=%s No Request Parm (%s)\n", - event.hostname.c_str(), - event.service.c_str(), - event.uuid.c_str()); - } - - /* Check the HTTP Status Code */ - event.status = guestHttpUtil_status ( event ) ; - if ( event.status == HTTP_NOTFOUND ) - { - wlog ("%s Not Found (%d)\n", event.log_prefix.c_str(), - event.status); - goto _guest_handler_done ; - } - - else if ( event.status != PASS ) - { - /* The VIM Might not be running at he time I issue the query. - * In hat case I will get back a 400 */ - if (( event.request != VIM_HOST_STATE_QUERY ) && ( event.status != 400 )) - { - elog ("%s HTTP Request Failed (%d) (%s)\n", - event.log_prefix.c_str(), - event.status, - event.uuid.c_str()); - } - goto _guest_handler_done ; - } - - /* No response content for this command */ - if ( event.request == VIM_HOST_INSTANCE_STATUS ) - { - jlog ("%s %s instance status change succeeded\n", event.hostname.c_str(), event.uuid.c_str()); - goto _guest_handler_done ; - } - - /* No response content for this command */ - else if ( event.request == VIM_HOST_INSTANCE_NOTIFY ) - { - jlog ("%s %s instance notify succeeded\n", event.hostname.c_str(), event.uuid.c_str()); - goto _guest_handler_done ; - } - - else if ( httpUtil_get_response ( event ) != PASS ) - { - wlog ("%s no response available\n", hostname.c_str()); - goto _guest_handler_done ; - } - - if ( event.response.length() ) - { - jlog ("%s Response: %s\n", event.hostname.c_str(), - event.response.c_str()); - - if ( event.request == VIM_HOST_STATE_QUERY ) - { - ilog ("%s host state query response\n", event.hostname.c_str()); - int rc = jsonUtil_get_key_val ( (char*)event.response.data(), "state", event.value ) ; - if ( rc != PASS ) - { - elog ("failed to state value (rc=%d)\n", rc ); - event.status = FAIL_KEY_VALUE_PARSE ; - event.value = "disabled" ; /* override to disabled if operation failed */ - } - } - - else if ( event.request == VIM_HOST_INSTANCE_FAILED ) - { - ilog ("%s instance failure response\n", event.uuid.c_str()); - // {"services": [ {"state": "enabled", "service": "heartbeat"}], - // "hostname": "compute-1", - // "uuid": "da973c2a-7469-4e06-b7e1-89bf2643f906"} - string state = "" ; - string service = "" ; - string uuid = "" ; - int rc1 = jsonUtil_get_key_val ( (char*)event.response.data(), "hostname", hostname ) ; - int rc2 = jsonUtil_get_key_val ( (char*)event.response.data(), "uuid" , uuid ) ; - if (!(rc1 | rc2 )) - { - /* Look for the list of services for this instance - * - currently only heartbeat is supported - * - * services:[ { "state": "enabled", "service": "heartbeat" } ] - */ - string service_list = "" ; - rc1 = jsonUtil_get_array_idx ((char*)event.response.data(), "services", 0, service_list ) ; - if ( rc1 == PASS ) - { - instInfo instance ; guestUtil_inst_init ( &instance ); - guestHostClass * obj_ptr = get_hostInv_ptr(); - string service = "" ; - - ilog ("Service List:%s\n", service_list.c_str()); // jlog1 - - instance.uuid = uuid ; - - /* Get the contents of the services list/array - * Note: we only support one element of the array so hat's - * why only index 0 is being requested or looked for - * - * Get the state of the only service - heartbeat */ - rc1 = jsonUtil_get_key_val ( (char*)service_list.data(), "state", instance.heartbeat.state ) ; - rc2 = jsonUtil_get_key_val ( (char*)service_list.data(), "service", service ) ; - - /* both of these must pass in order to add this instance */ - if (( rc1 == PASS ) && ( rc2 == PASS )) - { - if ( !service.compare("heartbeat") ) - { - instance.heartbeat.provisioned = true ; - - /* Its either enabled or disabled - * - default was disabled in guestUtil_inst_init above */ - if ( !instance.heartbeat.state.compare("enabled") ) - { - instance.heartbeat.reporting = true ; - rc1 = obj_ptr->mod_inst ( hostname, instance ); - } - else if ( !instance.heartbeat.state.compare("disabled") ) - { - instance.heartbeat.reporting = false ; - rc1 = obj_ptr->mod_inst ( hostname, instance ); - } - else - { - // raise error if it is neither enabled nor disabled - elog ("%s %s invalid heartbeat.state value %s received\n", - hostname.c_str(), instance.uuid.c_str(), instance.heartbeat.state.c_str()); - event.status = FAIL_INVALID_DATA ; - rc1 = FAIL; - } - if ( rc1 == PASS ) - { - /* o.K. so its provisioned !! */ - dlog ("%s %s instance modified\n", hostname.c_str(), instance.uuid.c_str()); - } - else - { - event.status = rc1 ; - } - } - else - { - elog ("%s unsupported 'service' (%s)\n", hostname.c_str(), service.c_str() ); - event.status = FAIL_INVALID_DATA ; - } - } - else - { - elog ("%s failed to get 'state' or 'service' (%d:%d)\n", hostname.c_str(), rc1, rc2 ); - event.status = FAIL_KEY_VALUE_PARSE ; - } - } - else - { - elog ("%s failed to get 'service list' or 'uuid' (%d:%d)\n", hostname.c_str(), rc1, rc2 ); - event.status = FAIL_KEY_VALUE_PARSE ; - } - } - else - { - ilog ("%s failed to get 'hostname' or 'uuid' (%d:%d)\n", event.hostname.c_str(), rc1, rc2 ); - event.status = FAIL_KEY_VALUE_PARSE ; - } - } - else if ( event.request == VIM_HOST_INSTANCE_QUERY ) - { - ilog ("%s instance query response\n", event.uuid.c_str()); - /* { "instances": [{"services": {"service":"heartbeat", "state":"enabled"}, - * "hostname": "compute-2", - * "uuid": "3aca8dad-0e38-4a58-83ab-23ee71159e0d"}]} */ - - int rc = jsonUtil_get_key_val ( (char*)event.response.data(), "instances", event.value ) ; - if ( rc != PASS ) - { - elog ("%s failed to get host instance array (rc=%d) (%s)\n", - event.hostname.c_str(), rc, event.uuid.c_str()); - event.status = FAIL_KEY_VALUE_PARSE ; - } - else - { - /* The following code parses a JSON string that looks like this. - * { - * "instances": - * [ - * { "services": { "service":"heartbeat", "state":"enabled" }, - * "hostname": "compute-2", - * "uuid" : "3aca8dad-0e38-4a58-83ab-23ee71159e0d" - * } - * ] , ... - * } - */ - int instances = 0 ; - jlog ("%s instance array %s\n", event.hostname.c_str(), (char*)event.response.data()); - rc = jsonUtil_array_elements ( (char*)event.response.data(), "instances", instances ); - if ( rc != PASS ) - { - elog ("%s failed to get array elements (%d)\n", hostname.c_str(), rc ); - event.status = FAIL_KEY_VALUE_PARSE ; - } - else - { - ilog ("%s has %d instances\n", hostname.c_str(), instances ); - for ( int i = 0 ; i < instances ; i++ ) - { - string instance_element = "" ; - rc = jsonUtil_get_array_idx ( (char*)event.response.data(), "instances", i, instance_element ); - if ( ( rc == PASS ) && ( instance_element.size() )) - { - /* Look for the list of services for this instance - * - currently only heartbeat is supported - * - * services:[ { "state": "enabled", "service": "heartbeat" } ] - **/ - string service_list = "" ; - string uuid = "" ; - int rc1 = jsonUtil_get_array_idx ((char*)instance_element.data(), "services", 0, service_list ) ; - int rc2 = jsonUtil_get_key_val ((char*)instance_element.data(), "uuid", uuid ) ; - if (( rc1 == PASS ) && ( rc2 == PASS )) - { - instInfo instance ; guestUtil_inst_init ( &instance ); - guestHostClass * obj_ptr = get_hostInv_ptr(); - string service = "" ; - - ilog ("Service List:%s\n", service_list.c_str()); - - instance.uuid = uuid ; - - /* Get the contents of the services list/array - * Note: we only support one element of the array so hat's - * why only index 0 is being requested or looked for - * - * Get the state of the only service - heartbeat */ - rc1 = jsonUtil_get_key_val ( (char*)service_list.data(), "state", instance.heartbeat.state ) ; - rc2 = jsonUtil_get_key_val ( (char*)service_list.data(), "service", service ) ; - - /* both of these must pass in order to add this instance */ - if (( rc1 == PASS ) && ( rc2 == PASS )) - { - if ( !service.compare("heartbeat") ) - { - instance.heartbeat.provisioned = true ; - - /* Its either enabled or disabled - * - default was disabled in guestUtil_inst_init above */ - if ( !instance.heartbeat.state.compare("enabled") ) - { - instance.heartbeat.reporting = true ; - rc = obj_ptr->add_inst ( hostname, instance ); - } - else if ( !instance.heartbeat.state.compare("disabled") ) - { - instance.heartbeat.reporting = false ; - rc = obj_ptr->add_inst ( hostname, instance ); - } - else - { - // raise error if it is neither enabled nor disabled - elog ("%s %s invalid heartbeat.state value %s received\n", - hostname.c_str(), instance.uuid.c_str(), instance.heartbeat.state.c_str()); - event.status = FAIL_INVALID_DATA ; - rc = FAIL; - } - if ( rc == PASS ) - { - /* o.K. so its provisioned !! */ - ilog ("%s %s instance added\n", hostname.c_str(), instance.uuid.c_str()); - } - else - { - event.status = rc ; - } - } - else - { - elog ("%s unsupported 'service' (%s)\n", hostname.c_str(), service.c_str() ); - event.status = FAIL_INVALID_DATA ; - } - } - else - { - elog ("%s failed to get 'state' or 'service' (%d:%d)\n", hostname.c_str(), rc1, rc2 ); - wlog ("... Service List: %s\n", service_list.data()); - event.status = FAIL_KEY_VALUE_PARSE ; - } - } - else - { - elog ("%s failed to get 'service list' or 'uuid' (%d:%d)\n", hostname.c_str(), rc1, rc2 ); - event.status = FAIL_KEY_VALUE_PARSE ; - } - } - else if ( rc != PASS ) - { - elog ("%s failed to get array index %d (rc=%d)\n", hostname.c_str(), i, rc ); - event.status = FAIL_KEY_VALUE_PARSE ; - } - } - } - } - } - } -_guest_handler_done: - - // httpUtil_log_event ( event ); - - if (( event.request != SERVICE_NONE ) && - ( event.status != HTTP_OK ) && - ( event.status != PASS )) - { - // wlog ("Event Status: %d\n", event.status ); - - /* TODO: Enable log_event */ - wlog ("%s Address : %s (%d)\n", - event.log_prefix.c_str(), - event.address.c_str(), - event.status); - elog ("%s Payload : %s\n", event.log_prefix.c_str(), event.payload.c_str()); - if ( event.response.size() ) - { - elog ("%s Response: %s\n", event.log_prefix.c_str(), event.response.c_str()); - } - else - { - elog ("%s: no response\n", event.log_prefix.c_str()); - } - } - event.active = false ; - httpUtil_free_conn ( event ); - httpUtil_free_base ( event ); - - /* This is needed to get out of the loop */ - event_base_loopbreak((struct event_base *)arg); -} - -/* The Guest Heartbeat event request handler - * wrapper abstracted from guestHostClass */ -void guestVimApi_Handler ( struct evhttp_request *req, void *arg ) -{ - get_hostInv_ptr()->guestVimApi_handler ( req , arg ); -} - -/***************************************************************************** - * - * Name : guestVimApi_svc_event - * - * Description: Send a VM instance service state/status change notification - * to the VIM. - * - * Warning : Only the 'heartbeat' service 'status' change is supported. - * - *****************************************************************************/ - -int guestVimApi_svc_event ( string hostname, - string instance_uuid, - string state, - string status, - string timeout) -{ - guestHostClass * obj_ptr = get_hostInv_ptr() ; - - ilog ("%s %s %s heartbeating status change to '%s' (to vim)\n", hostname.c_str(), - instance_uuid.c_str(), - state.c_str(), - status.c_str()); - - instInfo * instInfo_ptr = obj_ptr->get_inst ( instance_uuid ); - if ( instInfo_ptr ) - { - httpUtil_event_init ( &instInfo_ptr->vimEvent, - hostname, - VIM_SIG, - URL_VIM_ADDRESS, - daemon_get_cfg_ptr()->vim_event_port); - - instInfo_ptr->vimEvent.base = NULL ; - instInfo_ptr->vimEvent.conn = NULL ; - - /* Set the host context */ - instInfo_ptr->vimEvent.uuid = instance_uuid ; - instInfo_ptr->vimEvent.cur_retries = 0 ; - instInfo_ptr->vimEvent.max_retries = 3 ; - instInfo_ptr->vimEvent.active = true ; - instInfo_ptr->vimEvent.noncritical = false ; - - instInfo_ptr->vimEvent.request = VIM_HOST_INSTANCE_STATUS; - instInfo_ptr->vimEvent.operation = OPER__HOST_INST_CHANGE ; - instInfo_ptr->vimEvent.token.url = URL_VIM_INST_LABEL ; - instInfo_ptr->vimEvent.token.url.append(instance_uuid) ; - - /* The type of HTTP request */ - instInfo_ptr->vimEvent.type = EVHTTP_REQ_PATCH ; - - /* Build the payload */ - instInfo_ptr->vimEvent.payload = ("{\"uuid\":\""); - instInfo_ptr->vimEvent.payload.append (instance_uuid); - instInfo_ptr->vimEvent.payload.append ("\",\"hostname\":\""); - instInfo_ptr->vimEvent.payload.append (hostname); - instInfo_ptr->vimEvent.payload.append ("\",\"event-type\":\"service\",\"event-data\":{\"services\":"); - instInfo_ptr->vimEvent.payload.append ("[{\"service\":\"heartbeat\",\"state\":\""); - instInfo_ptr->vimEvent.payload.append (state); - instInfo_ptr->vimEvent.payload.append ("\",\"status\":\""); - instInfo_ptr->vimEvent.payload.append (status); - instInfo_ptr->vimEvent.payload.append ("\",\"restart-timeout\":\""); - instInfo_ptr->vimEvent.payload.append (timeout); - instInfo_ptr->vimEvent.payload.append ("\"}]}}"); - - jlog ("%s %s Payload: %s\n", hostname.c_str(), instance_uuid.c_str(), instInfo_ptr->vimEvent.payload.c_str()); - - return (guestHttpUtil_api_req ( instInfo_ptr->vimEvent )); - } - return (FAIL_HOSTNAME_LOOKUP); -} - - - - -/***************************************************************************** - * - * Name : guestVimApi_alarm_event - * - * Description: Send a VM instance service an alarm event. - * - *****************************************************************************/ - -int guestVimApi_alarm_event ( string hostname, - string instance_uuid) -{ - guestHostClass * obj_ptr = get_hostInv_ptr() ; - - ilog ("%s %s heartbeating alarm (ill health) event (to vim)\n", - hostname.c_str(), - instance_uuid.c_str()); - - instInfo * instInfo_ptr = obj_ptr->get_inst ( instance_uuid ); - if ( instInfo_ptr ) - { - httpUtil_event_init ( &instInfo_ptr->vimEvent, - hostname, - VIM_SIG, - URL_VIM_ADDRESS, - daemon_get_cfg_ptr()->vim_event_port); - - instInfo_ptr->vimEvent.base = NULL ; - instInfo_ptr->vimEvent.conn = NULL ; - - /* Set the host context */ - instInfo_ptr->vimEvent.uuid = instance_uuid ; - instInfo_ptr->vimEvent.cur_retries = 0 ; - instInfo_ptr->vimEvent.max_retries = 3 ; - instInfo_ptr->vimEvent.active = true ; - instInfo_ptr->vimEvent.noncritical = false ; - - instInfo_ptr->vimEvent.request = VIM_HOST_INSTANCE_STATUS; - instInfo_ptr->vimEvent.operation = OPER__HOST_INST_CHANGE ; - instInfo_ptr->vimEvent.token.url = URL_VIM_INST_LABEL ; - instInfo_ptr->vimEvent.token.url.append(instance_uuid) ; - - /* The type of HTTP request */ - instInfo_ptr->vimEvent.type = EVHTTP_REQ_PATCH ; - - /* Build the payload */ - instInfo_ptr->vimEvent.payload = ("{\"uuid\":\""); - instInfo_ptr->vimEvent.payload.append (instance_uuid); - instInfo_ptr->vimEvent.payload.append ("\",\"hostname\":\""); - instInfo_ptr->vimEvent.payload.append (hostname); - - instInfo_ptr->vimEvent.payload.append ("\",\"event-type\":\"alarm\",\"event-data\":{\"services\":"); - instInfo_ptr->vimEvent.payload.append ("[{\"service\":\"heartbeat\",\"state\":\"unhealthy\",\"repair-action\":\""); - instInfo_ptr->vimEvent.payload.append (instInfo_ptr->corrective_action); - instInfo_ptr->vimEvent.payload.append ("\"}]}}"); - - jlog ("%s %s Payload: %s\n", hostname.c_str(), - instance_uuid.c_str(), - instInfo_ptr->vimEvent.payload.c_str()); - - return (guestHttpUtil_api_req ( instInfo_ptr->vimEvent )); - } - return (FAIL_HOSTNAME_LOOKUP); -} - - -/***************************************************************************** - * - * Name : guestVimApi_inst_failed - * - * Description: Send a VM instance a failure notification to the VIM. - * - * Supported failures are ... - * - * MTC_EVENT_HEARTBEAT_LOSS - * - *****************************************************************************/ -int guestVimApi_inst_failed ( string hostname, - string instance_uuid, - unsigned int event, - int retries ) -{ - guestHostClass * obj_ptr = get_hostInv_ptr() ; - - elog ("%s %s *** Heartbeat Loss *** \n", - hostname.c_str(), - instance_uuid.c_str() ); - - if ( obj_ptr->get_reporting_state (hostname) == false ) - { - ilog ("%s cancelling failure notification request\n", hostname.c_str()); - ilog ("%s ... 'host' level fault reporting is disabled\n", hostname.c_str()); - return (PASS); - } - instInfo * instInfo_ptr = obj_ptr->get_inst ( instance_uuid ); - if ( instInfo_ptr ) - { - if (( event == MTC_EVENT_HEARTBEAT_LOSS ) && - ( instInfo_ptr->heartbeat.reporting == false )) - { - ilog ("%s cancelling failure notification request\n", hostname.c_str()); - ilog ("%s ... 'instance' level fault reporting is disabled\n", hostname.c_str()); - return (PASS); - } - - httpUtil_event_init ( &instInfo_ptr->vimEvent, - hostname, - VIM_SIG, - URL_VIM_ADDRESS, - daemon_get_cfg_ptr()->vim_event_port); - - instInfo_ptr->vimEvent.base = NULL ; - instInfo_ptr->vimEvent.conn = NULL ; - - /* Set the host context */ - instInfo_ptr->vimEvent.uuid = instance_uuid ; - instInfo_ptr->vimEvent.cur_retries = 0 ; - instInfo_ptr->vimEvent.max_retries = retries ; - instInfo_ptr->vimEvent.active = true ; - instInfo_ptr->vimEvent.noncritical = false ; - - instInfo_ptr->vimEvent.request = VIM_HOST_INSTANCE_FAILED; - instInfo_ptr->vimEvent.operation = OPER__HOST_INST_FAIL ; - instInfo_ptr->vimEvent.token.url = URL_VIM_INST_LABEL ; - instInfo_ptr->vimEvent.token.url.append(instance_uuid) ; - - /* The type of HTTP request */ - instInfo_ptr->vimEvent.type = EVHTTP_REQ_PATCH ; - - /* Build the payload */ - instInfo_ptr->vimEvent.payload = ("{\"uuid\":\""); - instInfo_ptr->vimEvent.payload.append (instance_uuid); - instInfo_ptr->vimEvent.payload.append ("\",\"hostname\":\""); - instInfo_ptr->vimEvent.payload.append (hostname); - if ( event == MTC_EVENT_HEARTBEAT_LOSS ) - { - instInfo_ptr->vimEvent.payload.append ("\",\"event-type\":\"alarm\",\"event-data\":{\"services\":"); - instInfo_ptr->vimEvent.payload.append ("[{\"service\":\"heartbeat\",\"state\":\"failed\",\"repair-action\":\""); - instInfo_ptr->vimEvent.payload.append (instInfo_ptr->corrective_action); - instInfo_ptr->vimEvent.payload.append ("\"}]}}"); - - wlog ("%s %s Payload: %s\n", hostname.c_str(), - instance_uuid.c_str(), - instInfo_ptr->vimEvent.payload.c_str()); - } - else - { - elog ("%s Unsupported 'event code' (%d)\n", instance_uuid.c_str(), event ); - return (FAIL_BAD_PARM); - } - - return (guestHttpUtil_api_req ( instInfo_ptr->vimEvent )); - } - return (FAIL_HOSTNAME_LOOKUP); -} - - -/***************************************************************************** - * - * Name : guestVimApi_inst_action - * - * Description: Send a notify message to the VIM in response to voting or notification - * - *****************************************************************************/ -int guestVimApi_inst_action ( string hostname, - string instance_uuid, - string action, - string guest_response, - string reason, - int retries) -{ - guestHostClass * obj_ptr = get_hostInv_ptr() ; - - ilog ("%s %s '%s' action (to vim)\n", hostname.c_str(), instance_uuid.c_str() , action.c_str() ); - - instInfo * instInfo_ptr = obj_ptr->get_inst ( instance_uuid ); - if ( !instInfo_ptr ) - return FAIL_HOSTNAME_LOOKUP; - - httpUtil_event_init ( &instInfo_ptr->vimEvent, - hostname, - VIM_SIG, - URL_VIM_ADDRESS, - daemon_get_cfg_ptr()->vim_event_port); - - instInfo_ptr->vimEvent.base = NULL ; - instInfo_ptr->vimEvent.conn = NULL ; - - /* Set the host context */ - instInfo_ptr->vimEvent.uuid = instance_uuid ; - instInfo_ptr->vimEvent.cur_retries = 0 ; - instInfo_ptr->vimEvent.max_retries = retries ; - instInfo_ptr->vimEvent.active = true ; - instInfo_ptr->vimEvent.noncritical = false ; - - instInfo_ptr->vimEvent.request = VIM_HOST_INSTANCE_NOTIFY; - instInfo_ptr->vimEvent.operation = OPER__HOST_INST_NOTIFY ; - instInfo_ptr->vimEvent.token.url = URL_VIM_INST_LABEL ; - instInfo_ptr->vimEvent.token.url.append(instance_uuid) ; - - /* The type of HTTP request */ - instInfo_ptr->vimEvent.type = EVHTTP_REQ_PATCH ; - - /* Build the payload */ - instInfo_ptr->vimEvent.payload = ("{\"uuid\":\""); - instInfo_ptr->vimEvent.payload.append (instance_uuid); - instInfo_ptr->vimEvent.payload.append ("\",\"event-type\": \"action\",\"event-data\": {\"action\": \""); - instInfo_ptr->vimEvent.payload.append (action); - instInfo_ptr->vimEvent.payload.append ("\", \"guest-response\": \""); - instInfo_ptr->vimEvent.payload.append (guest_response); - instInfo_ptr->vimEvent.payload.append ("\", \"reason\": \""); - instInfo_ptr->vimEvent.payload.append (jsonUtil_escapeSpecialChar(reason)); - instInfo_ptr->vimEvent.payload.append ("\"}}"); - - jlog ("%s %s Payload: %s\n", hostname.c_str(), instance_uuid.c_str(), instInfo_ptr->vimEvent.payload.c_str()); - - return (guestHttpUtil_api_req ( instInfo_ptr->vimEvent )); -} - - -/***************************************************************************** - * - * Name : guestVimApi_getHostState - * - * Description: Ask the VIM for the top level fault reporting - * state for this host - * - *****************************************************************************/ - -int guestVimApi_getHostState ( string hostname, string uuid, libEvent & event ) -{ - httpUtil_event_init ( &event, - hostname, - VIM_SIG, - URL_VIM_ADDRESS, - daemon_get_cfg_ptr()->vim_event_port); - - event.base = NULL ; - event.conn = NULL ; - event.uuid = uuid ; - event.active = true ; - event.noncritical = false ; - - event.type = EVHTTP_REQ_GET ; - event.request = VIM_HOST_STATE_QUERY; - event.operation = OPER__HOST_STATE_QUERY ; - event.token.url = URL_VIM_HOST_LABEL ; - event.token.url.append(event.uuid); - - /* Build the payload */ - event.payload = "{\"hostname\": \""; - event.payload.append (hostname) ; - event.payload.append ("\",\"uuid\":\""); - event.payload.append (uuid); - event.payload.append ("\"}"); - - jlog ("%s %s Payload: %s\n", hostname.c_str(), uuid.c_str(), event.payload.c_str()); - - return ( guestHttpUtil_api_req ( event ) ); -} - - -/***************************************************************************** - * - * Name : guestVimApi_getHostInst - * - * Description: Ask the VIM for all the VM instance info for the - * specified host. - * - *****************************************************************************/ -int guestVimApi_getHostInst ( string hostname, string uuid, libEvent & event ) -{ - httpUtil_event_init ( &event, - hostname, - VIM_SIG, - URL_VIM_ADDRESS, - daemon_get_cfg_ptr()->vim_event_port); - - event.base = NULL ; - event.conn = NULL ; - event.uuid = uuid ; - event.active = true ; - event.noncritical = false ; - - event.type = EVHTTP_REQ_GET ; - event.request = VIM_HOST_INSTANCE_QUERY; - event.operation = OPER__HOST_INST_QUERY ; - event.token.url = URL_VIM_INST_LABEL ; - event.token.url.append("?host_uuid="); - event.token.url.append(event.uuid); - - jlog ("%s %s Payload: %s\n", hostname.c_str(), event.uuid.c_str(), event.token.url.c_str()); - - return ( guestHttpUtil_api_req ( event ) ); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.h b/mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.h deleted file mode 100644 index 176fa203..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestVimApi.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef __INCLUDE_GUESTVIMAPI_H__ -#define __INCLUDE_GUESTVIMAPI_H__ -/* - * Copyright (c) 2013, 2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* - */ - -#include -#include - -#include "guestHttpUtil.h" - - /** - * @file - * Wind River CGTS Platform Guest Services Request Transmitter. - * - * This module is used by the guestAgent only and allows the guestAgent to - * - * 1. Transmit notification of an instance failure to the VIM - * - * guestVimApi_inst_failed - * - * 2. Get the instrance info for a specified host from the VIM - * - * guestVimApi_getHostState - * - * 3. Get the host level fault reporting state. - * - * guestVimApi_getHostInst - * - **************************************************************************/ - -int guestVimApi_init ( string ip, int port ); -void guestVimApi_fini ( void ); - -int guestVimApi_inst_failed ( string hostname, string instance, unsigned int event, int retries ); -int guestVimApi_inst_action ( string hostname, string instance_uuid, string action, string guest_response, string reason, int retries=0 ); -int guestVimApi_svc_event ( string hostname, string instance_uuid, string state, string status, string timeout ); -int guestVimApi_alarm_event ( string hostname, string instance_uuid ); -int guestVimApi_getHostInst ( string hostname, string uuid, libEvent & event ); -int guestVimApi_getHostState ( string hostname, string uuid, libEvent & event ); - -void guestVimApi_Handler ( struct evhttp_request *req, void *arg ); - -#endif /* __INCLUDE_GUESTVIMAPI_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.cpp b/mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.cpp deleted file mode 100644 index 88f5f4e2..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.cpp +++ /dev/null @@ -1,373 +0,0 @@ -/* -* Copyright (c) 2013-2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* -*/ - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace std; - -#include "nodeBase.h" -#include "nodeEvent.h" -#include "guestBase.h" -#include "guestUtil.h" -#include "guestVirtio.h" -#include "guestInstClass.h" /* for ... get_inst */ - -/***************************************************************************** - * Name : virtio_check_filename - * - * Purpose: Return valid virtio instance heartbeat messaging socket filenames - * - * Description: - * - * Check a filename, already striped of an directory component, - * against the expected pattern for a cgcs heartbeat vio socket file. - * - * If satisfied, returns an allocated buffer containing the qemu instance name. - * The buffer must be free'd. - * - * Returns NULL on failure. - * - *****************************************************************************/ - -const char* host_virtio_dir = "/var/lib/libvirt/qemu"; - -// Use instance id to substitute the first %s below -const char* host_virtio_file_format_print = "cgcs.heartbeat.%s.sock"; -const char* alt_host_virtio_file_format_print = "wrs.heartbeat.agent.0.%s.sock"; - -// Must return '2' when scaned, first buffer recieves instance id, second should get a k, and third is unused -const char* virtio_file_format_scan = "%m[cgcs].%m[heartbeat].%m[^.].soc%m[k]%ms"; -const char* host_virtio_file_format_scan = "cgcs.heartbeat.%m[^.].soc%m[k]%ms"; -const char* alt_host_virtio_file_format_scan = "wrs.heartbeat.agent.0.%m[^.].soc%m[k]%ms"; - -string virtio_instance_name ( char * fn ) -{ - string name = "" ; - char *s1 = NULL; - char *s2= NULL; - char *instance_name = NULL; - - int rc = sscanf(fn, host_virtio_file_format_scan, &instance_name, &s1, &s2); - if (rc != 2) - { - dlog3 ("'%s' does not satisfy scan pattern %s\n", fn, host_virtio_file_format_scan); - if (s1) - { - free(s1); - s1 = NULL; - } - - if (s2) - { - free(s2); - s2 = NULL; - } - - if (instance_name) - { - free(instance_name); - instance_name = NULL; - } - - rc = sscanf(fn, alt_host_virtio_file_format_scan, &instance_name, &s1, &s2); - if (rc != 2) - { - dlog3 ("'%s' does not satisfy scan pattern %s\n", fn, alt_host_virtio_file_format_scan); - if (instance_name) - { - free(instance_name); - instance_name = NULL; - } - } - else - { - /* Valid instance filename found */ - name = instance_name ; - } - } - else - { - /* Valid instance filename found */ - name = instance_name ; - } - - if (s1) free(s1); - if (s2) free(s2); - - if (instance_name) - { - free(instance_name); - } - - return (name); -} - - -bool virtio_check_filename ( char * fn ) -{ - string instance_name = virtio_instance_name ( fn ) ; - if ( instance_name.size () == UUID_LEN ) - return true ; - else - return false ; -} - -/* Add the auto detected channel to the instance list - * WARNING: This is where the cgcs.heartbeat.*.sock part is - * removed from the channel and put into the instInfo - * struct as a uuid value */ -int virtio_channel_add ( char * channel ) -{ - instInfo * instInfo_ptr ; - int rc = FAIL_NOT_FOUND ; - char * prefix1 = NULL ; - char * prefix2 = NULL ; - char * suffix = NULL ; - char * uuid_ptr = NULL ; - char * s1 = NULL ; - string uuid = ""; - instInfo instance ; - guestUtil_inst_init ( &instance ); - - rc = sscanf(channel, virtio_file_format_scan, &prefix1, &prefix2, &uuid_ptr, &suffix, &s1 ); - if ( rc != 4 ) - { - elog ("failed to extract uuid from channel %s (num:%d)\n", channel, rc); - rc = FAIL_INVALID_DATA ; - goto virtio_channel_add_cleanup ; - } - - uuid = uuid_ptr ; - if ( uuid.length() != UUID_LEN ) - { - elog ("failed to get UUID from channel %s (uuid:%ld)\n", uuid.c_str(), uuid.length()); - rc = FAIL_INVALID_UUID ; - goto virtio_channel_add_cleanup ; - } - - - instInfo_ptr = get_instInv_ptr()->get_inst ( uuid ); - if ( instInfo_ptr ) - { - /* detected channel found */ - ilog ("%s add ; already provisioned\n", log_prefix(instInfo_ptr).c_str()); - rc = PASS ; - } - else if ( ( rc = get_instInv_ptr()->add_inst ( uuid, instance ) ) == PASS ) - { - dlog ("%s add ; auto provisioned\n", instance.uuid.c_str()); - rc = PASS ; - } - else - { - elog ("%s add failed\n", uuid.c_str()); - rc = FAIL_INVALID_UUID ; - } - - if ( rc == PASS ) - { - - /* get the recently added instance */ - instInfo_ptr = get_instInv_ptr()->get_inst ( uuid ); - if ( instInfo_ptr ) - { - instInfo_ptr->uuid = uuid ; - instInfo_ptr->chan = channel ; - instInfo_ptr->fd_namespace = QEMU_CHANNEL_DIR ; - instInfo_ptr->fd_namespace.append ("/") ; - instInfo_ptr->fd_namespace.append (channel) ; - - instInfo_ptr->connect_wait_in_secs = DEFAULT_CONNECT_WAIT ; - - get_instInv_ptr()->reconnect_start ( (const char *)uuid_ptr ) ; - } - } - -virtio_channel_add_cleanup: - - if (prefix1) free(prefix1); - if (prefix2) free(prefix2); - if (suffix) free(suffix); - if (uuid_ptr) free(uuid_ptr); - if (s1) free (s1); - - return(rc); -} - - - -/***************************************************************************** - * - * Name : virtio_channel_connect - * - * Purpose : Connect to the channel specified by the instance pointer - * - *****************************************************************************/ -int virtio_channel_connect ( instInfo * instInfo_ptr ) -{ - int rc = PASS ; - char buf[PATH_MAX]; - - if ( ! instInfo_ptr ) - { - slog ("called with NULL instance pointer\n"); - return (FAIL_NULL_POINTER); - } - - snprintf(buf, sizeof(buf), "%s/cgcs.heartbeat.%s.sock", QEMU_CHANNEL_DIR, instInfo_ptr->uuid.data()); - - dlog ("... trying connect: %s\n", buf ); - - if (( instInfo_ptr->chan_fd > 0 ) && ( instInfo_ptr->chan_ok == true )) - { - if ( instInfo_ptr->connected ) - { - ilog ("%s already connected\n", log_prefix(instInfo_ptr).c_str()); - return (PASS); - } - else - { - ilog ("%s socket and chan ok but not connected\n", log_prefix(instInfo_ptr).c_str()); - } - } - - instInfo_ptr->chan_ok = false ; - instInfo_ptr->connected = false ; - - if ( instInfo_ptr->chan_fd ) - close (instInfo_ptr->chan_fd); - - /* found channel */ - instInfo_ptr->chan_fd = socket ( AF_UNIX, CHAN_FLAGS, 0 ); - if ( instInfo_ptr->chan_fd <= 0 ) - { - ilog("%s socket create failed for %s, (%d:%m)\n", log_prefix(instInfo_ptr).c_str(), buf, errno ) ; - rc = FAIL_SOCKET_CREATE ; - } - else - { - int flags ; - struct linger so_linger ; - - /* get socket flags */ - flags = fcntl(instInfo_ptr->chan_fd, F_GETFL); - if (flags < 0) - { - elog ("%s failed to get socket %d flags (%d:%m)\n", - log_prefix(instInfo_ptr).c_str(), - instInfo_ptr->chan_fd , errno); - rc = FAIL_SOCKET_OPTION ; - } - - /* set socket as nonblocking */ - if ( flags & O_NONBLOCK ) - { - dlog ("%s Socket already set as non-blocking\n", - log_prefix(instInfo_ptr).c_str()); - } - else - { - flags = (flags | O_NONBLOCK); - if (fcntl(instInfo_ptr->chan_fd, F_SETFL, flags) < 0) - { - elog ("%s failed to set socket %d nonblocking (%d:%m)\n", - instInfo_ptr->uuid.data(), - instInfo_ptr->chan_fd , errno); - rc = FAIL_SOCKET_NOBLOCK ; - } - } - so_linger.l_onoff = 1 ; /* true */ - so_linger.l_linger = 0 ; /* linger time is 0 ; no TIME_WAIT */ - - rc = setsockopt ( instInfo_ptr->chan_fd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof(so_linger)); - if ( rc ) - { - elog ("%s failed to set linger=0 option (%d:%m)\n", log_prefix(instInfo_ptr).c_str(), errno ); - } - } - - if ( rc == PASS ) - { - int len ; - struct sockaddr_un un; - un.sun_family = AF_UNIX; - - strcpy(un.sun_path, buf); - len = offsetof(struct sockaddr_un, sun_path) + strlen(buf); - rc = connect(instInfo_ptr->chan_fd, (struct sockaddr *)&un, len); - if (rc < 0) - { - elog ( "%s connect failed %s (%d:%d:%m)\n", - log_prefix(instInfo_ptr).c_str(), buf, rc, errno); - } - else - { - ilog ("%s connect accepted\n", log_prefix(instInfo_ptr).c_str() ); - instInfo_ptr->chan_ok = true ; - instInfo_ptr->connected = true ; - rc = PASS ; - } - } - /* Handle errors */ - if ( rc != PASS ) - { - /* TODO: cleanup */ - if (instInfo_ptr->chan_fd ) - { - ilog ("%s closing socket %d\n", - log_prefix(instInfo_ptr).c_str(), - instInfo_ptr->chan_fd); - - close (instInfo_ptr->chan_fd) ; - instInfo_ptr->chan_fd = 0 ; - instInfo_ptr->chan_ok = false ; - instInfo_ptr->connected = false ; - } - /* TODO: consider removing this entry from the list */ - } - return (rc); -} - - -int virtio_channel_connect ( string channel ) -{ - instInfo * instInfo_ptr = get_instInv_ptr()->get_inst ( channel ) ; - if ( instInfo_ptr ) - { - return ( virtio_channel_connect ( instInfo_ptr )); - } - elog ("%s instance lookup failed\n", channel.c_str() ); - return (FAIL_NULL_POINTER); -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.h b/mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.h deleted file mode 100644 index 82f31382..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/guestVirtio.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef __GUESTVIRTIO_H__ -#define __GUESTVIRTIO_H__ - -/* -* Copyright (c) 2013-2015 Wind River Systems, Inc. -* -* SPDX-License-Identifier: Apache-2.0 -* -*/ - -#include -#include - -using namespace std; - -#include "guestBase.h" - -bool virtio_check_filename ( char * fn ); -int virtio_channel_connect ( string channel ); -int virtio_channel_connect ( instInfo * inst_ptr ); -int virtio_channel_add ( char * chan_ptr ); -string virtio_instance_name ( char * fn ); - -#endif /* __GUESTVIRTIO_H__ */ diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guest.ini b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guest.ini deleted file mode 100644 index 26e666fd..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guest.ini +++ /dev/null @@ -1,28 +0,0 @@ -; CGTS Guest Service daemons config file -[agent] ; Agent Configuration -rx_port = 2401 ; guestAgent inter-daemon messaging rx port number -vim_cmd_port = 2410 ; vim to guestAgent command port -hbs_failure_threshold = 1 ; Number of failures to accept before reporting the fault - -[client] ; Client Configuration -rx_port = 2411 ; guestAgent inter-daemon messaging rx port number -hbs_failure_threshold = 1 ; Number of failures to accept before reporting the fault -hbs_pulse_period = 400 ; Smallest allowable heartbeat interval in msecs - -[timeouts] ; Configurable timeouts - values in seconds -start_delay = 1 ; time in secs to wait before starting failure reporting - -[debug] ; -debug_timer = 0 ; enable(1) or disable(0) timer logs (tlog) -debug_json = 0 ; enable(1) or disable(0) Json logs (jlog) -debug_fsm = 0 ; enable(1) or disable(0) fsm logs (flog) -debug_http = 0 ; enable(1) or disable(0) http logs (hlog) -debug_alive = 0 ; enable(1) or disable(0) mtcAlive logs (alog) -debug_msg = 0 ; enable(1) or disable(0) message logs (mlog) -debug_state = 0 ; enable(1) or disable(0) state change logs (clog) -debug_work = 0 ; enable(1) or disable(0) work queue trace logs (qlog) -debug_level = 0 ; decimal mask 0..15 (8,4,2,1) and 16 for mem logging -debug_all = 0 ; set all debug labels to the specified value - -flush = 1 ; enable(1) or disable(0) force log flush (main loop) -flush_thld = 5 ; if enabled - force flush after this number of loops diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent deleted file mode 100644 index 364e1e71..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent +++ /dev/null @@ -1,113 +0,0 @@ -#! /bin/sh -# -# Copyright (c) 2013-2014, 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# chkconfig: 2345 95 95 -# -### BEGIN INIT INFO -# Provides: guestAgent -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Maintenance Client Daemon -### END INIT INFO - -. /etc/init.d/functions - -DAEMON_NAME="guestAgent" -DAEMON="/usr/local/bin/${DAEMON_NAME}" -PIDFILE="/var/run/${DAEMON_NAME}.pid" -PLATFORM_CONF="/etc/platform/platform.conf" - -IFACE="" - -# Linux Standard Base (LSB) Error Codes -RETVAL=0 -GENERIC_ERROR=1 -INVALID_ARGS=2 -UNSUPPORTED_FEATURE=3 -NOT_INSTALLED=5 -NOT_RUNNING=7 - -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin -export PATH - -if [ ! -e "${DAEMON}" ] ; then - logger "${DAEMON} is missing" - exit ${NOT_INSTALLED} -fi - -if [ -f ${PLATFORM_CONF} ] ; then - IFACE=`cat ${PLATFORM_CONF} | grep management_interface | cut -f2 -d'='` - if [ "${IFACE}" != "" ] ; then - if ip link show $IFACE | grep -sq 'state DOWN'; then - ip link set dev $IFACE up - fi - fi -fi - -case "$1" in - start) - logger "Starting ${DAEMON_NAME}" - echo -n "Starting ${DAEMON_NAME}: " - if [ -n "`pidof ${DAEMON_NAME}`" ] ; then - echo -n "is already running " - RETVAL=0 - else - start-stop-daemon --start -b -x ${DAEMON} -- -l - RETVAL=$? - fi - if [ ${RETVAL} -eq 0 ] ; then - pid=`pidof ${DAEMON_NAME}` - echo "OK" - logger "${DAEMON} (${pid})" - else - echo "FAIL" - RETVAL=${GENERIC_ERROR} - fi - ;; - - stop) - logger "Stopping ${DAEMON_NAME}" - echo -n "Stopping ${DAEMON_NAME}: " - if [ -n "`pidof ${DAEMON_NAME}`" ] ; then - killproc ${DAEMON_NAME} - fi - if [ -n "`pidof ${DAEMON_NAME}`" ] ; then - echo "FAIL" - RETVAL=${NOT_RUNNING} - else - echo "OK" - fi - rm -f ${PIDFILE} - ;; - - restart) - $0 stop - $0 start - ;; - - status) - pid=`pidof ${DAEMON_NAME}` - RETVAL=$? - if [ ${RETVAL} -eq 0 ] ; then - echo "${DAEMON_NAME} is running" - else - echo "${DAEMON_NAME} is NOT running" - RETVAL=${NOT_RUNNING} - fi - ;; - - condrestart) - $0 restart - ;; - - *) - echo "usage: $0 { start | stop | status | restart | condrestart | status }" - ;; -esac - -exit ${RETVAL} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.logrotate b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.logrotate deleted file mode 100644 index 654a7135..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.logrotate +++ /dev/null @@ -1,16 +0,0 @@ -#daily - -/var/log/guestAgent.log -{ - nodateext - size 10M - rotate 5 - start 1 - missingok - notifempty - compress - sharedscripts - postrotate - systemctl reload syslog-ng > /dev/null 2>&1 || true - endscript -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.ocf b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.ocf deleted file mode 100644 index 34708a87..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.ocf +++ /dev/null @@ -1,442 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2013-2017 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# Support: www.windriver.com -# -# Purpose: This resource agent manages -# -# .... the Titanium Cloud Controller Maintenance Daemon -# -# RA Spec: -# -# http://www.opencf.org/cgi-bin/viewcvs.cgi/specs/ra/resource-agent-api.txt?rev=HEAD -# -####################################################################### -# Initialization: - -: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} -. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs - - -####################################################################### - -# Fill in some defaults if no values are specified -OCF_RESKEY_binary_default="guestAgent" -OCF_RESKEY_config_default="/etc/mtc/guestAgent.ini" -OCF_RESKEY_dbg_default="false" -OCF_RESKEY_mode_default="normal" -OCF_RESKEY_user_default="admin" -OCF_RESKEY_pid_default="/var/run/guestAgent.pid" - - -: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} -: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} -: ${OCF_RESKEY_dbg=${OCF_RESKEY_dbg_default}} -: ${OCF_RESKEY_mode=${OCF_RESKEY_mode_default}} -: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} -: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}} - -mydaemon="/usr/local/bin/${OCF_RESKEY_binary}" -statusfile="/var/run/${OCF_RESKEY_binary}.info" - -####################################################################### - -usage() { - cat < - - -1.0 - - -This 'guestAgent' is an OCF Compliant Resource Agent that manages start, stop and in- -service monitoring of Maintenance's guestAgent daemon on Wind River's Titanium Cloud. - - - -Manages the Titanium Cloud's Maintenance guestAgent service daemon. - - - - - - - -mode = normal ... run maintenance daemon in 'normal' mode (default) -mode = passive ... run maintenance daemon in 'passive' mode - -Maintenance Mode Option - - - - - - -dbg = false ... info, warn and err logs sent to output stream (default) -dbg = true ... Additional dbg logs are also sent to the output stream - -Service Debug Control Option - - - - - - - - - - - - - - -END - return ${OCF_SUCCESS} -} - -guestAgent_validate() { - - if [ ${OCF_RESKEY_dbg} = "true" ] ; then - ocf_log info "guestAgent:validate" - fi - - check_binary "/usr/local/bin/${OCF_RESKEY_binary}" - check_binary pidof - - if [ ! -f ${OCF_RESKEY_config} ] ; then - msg="${OCF_RESKEY_binary} file missing ${OCF_RESKEY_config}" - ocf_log err "${msg}" - return ${OCF_ERR_CONFIGURED} - fi - - return ${OCF_SUCCESS} -} - -guestAgent_status () { - - proc="guestAgent:status" - if [ ${OCF_RESKEY_dbg} = "true" ] ; then - ocf_log info "guestAgent:status" - fi - - # remove the status file before we request a new - rm -f ${statusfile} - - # Verify the pid file exists as part of status - for ((loop=0;loop<3;loop++)) { - if [ -f ${OCF_RESKEY_pid} ] ; then - break - else - sleep 1 - fi - } - - # See if the daemon is running - pid=`cat ${OCF_RESKEY_pid}` - kill -0 $pid 2> /dev/null - if [ $? -eq 0 ] ; then - - log_sig="${OCF_RESKEY_binary} In-Service Active Monitor Test" - - # Ask the daemon to produce status - ocf_run kill -s USR1 $pid - - # Wait for the response - for ((loop=0;loop<10;loop++)) { - sleep 1 - if [ -f ${statusfile} ] ; then - - ocf_log info "${log_sig} Passed ($loop)" - return ${OCF_SUCCESS} - - elif [ $loop -eq 5 ] ; then - - # send the signal again - ocf_run kill -s USR1 $pid - - pid_stat=`cat /proc/${pid}/stat` - ocf_log notice "${log_sig} is slow to respond" - ocf_log notice "$pid_stat" - - elif [ $loop -eq 8 ] ; then - - pid_stat=`cat /proc/${pid}/stat` - ocf_log warn "${log_sig} is very slow to respond" - ocf_log warn "$pid_stat" - - fi - } - log_procfs - ocf_log err "${log_sig} Failed" - return ${OCF_ERR_GENERIC} - fi - return ${OCF_NOT_RUNNING} -} - -guestAgent_monitor () { - - proc="guestAgent:monitor" - if [ ${OCF_RESKEY_dbg} = "true" ] ; then - ocf_log info "${proc}" - fi - - # Uncomment if you want the monitor function to force-pass - # return ${OCF_SUCCESS} - - pid=`cat ${OCF_RESKEY_pid}` - kill -0 $pid 2> /dev/null - if [ $? -ne 0 ] ; then - if [ ${OCF_RESKEY_dbg} = "true" ] ; then - ocf_log info "${proc} called while ${OCF_RESKEY_binary} not running." - fi - return ${OCF_NOT_RUNNING} - fi - - guestAgent_status - return $? -} - - -guestAgent_start () { - - local rc - - start_proc="guestAgent:start" - if [ ${OCF_RESKEY_dbg} = "true" ] ; then - ocf_log info "${start_proc}" - fi - - # Uncomment if you want the start function to force-pass without starting - # return ${OCF_SUCCESS} - - # If running then issue a ping test - pid=`cat ${OCF_RESKEY_pid}` - kill -0 $pid 2> /dev/null - if [ $? -eq 0 ] ; then - guestAgent_status - rc=$? - if [ $rc -ne ${OCF_SUCCESS} ] ; then - msg="${start_proc} ping test failed rc=${rc}" - ocf_log err "${msg}" - guestAgent_stop - else - # Spec says to return success if process is already running for start - pid=`cat ${OCF_RESKEY_pid}` - kill -0 $pid 2> /dev/null - if [ $? -eq 0 ] ; then - ocf_log info "${start_proc} called while ${OCF_RESKEY_binary} is already running" - return ${OCF_SUCCESS} - fi - fi - fi - - # should not be running now or error - pid=`cat ${OCF_RESKEY_pid}` - kill -0 $pid 2> /dev/null - if [ $? -eq 0 ] ; then - msg="${start_proc} cannot kill off existing instance of ${OCF_RESKEY_binary}" - ocf_log err "${msg}" - return ${OCF_RUNNING_MASTER} - fi - - rm -f ${statusfile} - - # default PID to null - pid="" - - # Try to Start the daemon - ${mydaemon} - rc=$? - - # verify it was started and set return code appropriately - if [ $rc -eq ${OCF_SUCCESS} ] ; then - # Verify the pid file exists as part of status - for ((loop=0;loop<3;loop++)) { - if [ -f ${OCF_RESKEY_pid} ] ; then - break - else - ocf_log info "${start_proc} waiting ... loop=${loop}" - sleep 1 - fi - } - - pid=`cat ${OCF_RESKEY_pid}` - # ocf_log info "PID:$pid" - kill -0 $pid 2> /dev/null - if [ $? -ne 0 ] ; then - rc=${OCF_FAILED_MASTER} - else - if [ ! -f ${statusfile} ] ; then - ocf_log info "guestAgent: Startup Health Test Failed - missing info" - rc = ${OCF_ERR_GENERIC} - fi - fi - else - ocf_log info "${start_proc} failed ${mydaemon} daemon rc=${rc}" - rc = ${OCF_ERR_GENERIC} - fi - - # Record success or failure and return status - if [ ${rc} -eq $OCF_SUCCESS ] ; then - msg="${start_proc}ed pid=${pid}" - ocf_log info "${msg}" - else - msg="${start_proc} failed rc=${rc}" - ocf_log err "${msg}" - rc=${OCF_NOT_RUNNING} - fi - return $rc -} - -guestAgent_confirm_stop () { - - proc="guestAgent:confirm_stop" - ocf_log info "${proc}" - - pid=`pidof ${OCF_RESKEY_binary}` - kill -0 ${pid} 2> /dev/null - if [ $? -eq 0 ] ; then - ocf_log info "${proc} 'kill -9 ${pid}'" - kill -9 ${pid} - ocf_log info "${proc}ed (by emergency kill -9 ${pid})" - sleep 1 - fi - rm -f ${OCF_RESKEY_pid} -} - -guestAgent_stop () { - - proc="guestAgent:stop" - - # See if the process is running by pidfile - - pid=`pidof ${OCF_RESKEY_binary}` - ocf_log info "${proc} PID:${pid}" - kill -0 ${pid} 2> /dev/null - if [ $? -ne 0 ] ; then - ocf_log info "${proc} called while already stopped (no process)" - guestAgent_confirm_stop - return ${OCF_SUCCESS} - fi - - MAX=3 - for ((loop=0;loop<$MAX;loop++)) { - - # verify stop with pidfile - if [ -f ${OCF_RESKEY_pid} ] ; then - - pid=`cat ${OCF_RESKEY_pid}` - - # if pid file is gone we are done - if [ ${pid} = "" ] ; then - ocf_log info "${proc}ped (by -int)" - break - - # if pidfile is empty then kill by -int - else - - kill -0 ${pid} 2> /dev/null - if [ $? -ne 0 ] ; then - ocf_log info "${proc}ped (by pid)" - break - else - ocf_log info "${proc}ping (by -int - loop:${loop})" - kill -int ${pid} - sleep 1 - fi - fi - fi - } - guestAgent_confirm_stop - return ${OCF_SUCCESS} -} - -guestAgent_reload () { - - local rc - - proc="guestAgent:reload" - if [ ${OCF_RESKEY_dbg} = "true" ] ; then - ocf_log info "${proc}" - fi - - guestAgent_stop - rc=$? - if [ $rc -eq ${OCF_SUCCESS} ] ; then - #sleep 1 - guestAgent_start - rc=$? - if [ $rc -eq ${OCF_SUCCESS} ] ; then - msg="${proc}ed" - ocf_log info "${mgs}" - fi - fi - - if [ ${rc} -ne ${OCF_SUCCESS} ] ; then - msg="${OCF_RESKEY_binary}: failed to restart rc=${rc}" - ocf_log info "${mgs}" - fi - - return ${rc} -} - -case ${__OCF_ACTION} in - meta-data) meta_data - exit ${OCF_SUCCESS} - ;; - usage|help) usage - exit ${OCF_SUCCESS} - ;; -esac - -ocf_log info "guestAgent:${__OCF_ACTION} action" - -# Anything except meta-data and help must pass validation -guestAgent_validate || exit $? - -case ${__OCF_ACTION} in - start) guestAgent_start - ;; - stop) guestAgent_stop - ;; - status) guestAgent_status - ;; - reload) guestAgent_reload - ;; - monitor) guestAgent_monitor - ;; - validate-all) guestAgent_validate - ;; - *) usage - exit ${OCF_ERR_UNIMPLEMENTED} - ;; -esac diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.service b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.service deleted file mode 100644 index e88a965b..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgent.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Titanium Cloud Guest Agent -After=network.target syslog.service - -[Service] -Type=forking -ExecStart=/etc/rc.d/init.d/guestAgent start -ExecStop=/etc/rc.d/init.d/guestAgent stop -ExecReload=/etc/rc.d/init.d/guestAgent reload -PIDFile=/var/run/guestAgent.pid - -Restart=no - -[Install] -WantedBy=multi-user.target - diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgentTest.sh b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgentTest.sh deleted file mode 100644 index a4994e0f..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestAgentTest.sh +++ /dev/null @@ -1,160 +0,0 @@ -#! /bin/bash - -# -# Copyright (c) 2015 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -echo "Running guestAgent guest services command testhead" - -if [ -z $1 ] ; then - echo "Error: must supply a host name as first arguement" - echo "Syntax: $0 compute-1" - exit 1 -fi - -echo "Args: $1 $2 $3" - -banner="-----------------------------------------------------------" - -hostname=$1 -hostuuid=`system host-show $hostname | grep uuid | cut -f 15 -d ' '` -#hostuuid=`system host-show $hostname | grep uuid` - -echo "hostname: $hostname" -echo "hostuuid: $hostuuid" -echo "Emulating VIM guest services commands against $hostname" - -count=1 - -echo $banner -echo "$count Create Host Services" -echo $banner -curl -i -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/$hostuuid - -count=$((count + 1)) - -echo $banner -echo "$count Query Host Services" -echo $banner -curl -i -X GET -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/$hostuuid - -count=$((count + 1)) - -echo $banner -echo "$count Enable Host Services" -echo $banner -curl -i -X PUT -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/$hostuuid/enable -d '{"hostname": "compute-1", "uuid" : "010e7741-1173-4a3b-88fa-c4e5905500ca"}' - -count=$((count + 1)) - -echo $banner -echo "$count Create Guest Service: Instance 1" -echo $banner -curl -i -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104400 -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df104400", "channel" : "cgts-instance000001", "services" : ["heartbeat"]}' - -count=$((count + 1)) - -echo $banner -echo "$count Create Guest Service: Instance 2" -echo $banner -curl -i -X POST -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104401 -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df104401", "channel" : "cgts-instance000002", "services" : ["heartbeat"]}' - -count=$((count + 1)) - -echo $banner -echo "$count Query Guest Services: Instance 2:" -echo $banner -curl -i -X GET -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104401 - -count=$((count + 1)) - -echo $banner -echo "$count Query Guest Services: Instance 1:" -echo $banner -curl -i -X GET -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104400 - -count=$((count + 1)) - -echo $banner -echo "$count Enable Guest Service: Instance 2" -echo $banner -curl -i -X PATCH -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104401 -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df104401", "channel" : "cgts-instance000002", "services" : [{"service":"heartbeat" , "state":"enabled"}]}' - -count=$((count + 1)) - -echo $banner -echo "$count Query Guest Services: Instance 2:" -echo $banner -curl -i -X GET -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104401 - -count=$((count + 1)) - -echo $banner -echo "$count Disable Guest Service: Instance 2" -echo $banner -curl -i -X PATCH -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104401 -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df104401", "channel" : "cgts-instance000002", "services" : [{"service":"heartbeat" , "state":"disabled"}]}' - -count=$((count + 1)) - -echo $banner -echo "$count Query Guest Services: Instance 1:" -echo $banner -curl -i -X GET -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104401 - -count=$((count + 1)) - -exit 0 - -echo $banner -echo "$count Delete Guest Service: Instance 2" -echo $banner -curl -i -X DELETE -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104401 - -count=$((count + 1)) - -echo $banner -echo "$count Query Host Services" -echo $banner -curl -i -X GET -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/$hostuuid - -count=$((count + 1)) - -echo $banner -echo "$count Disable Host Services" -echo $banner -curl -i -X PUT -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/$hostuuid/disable -d '{"hostname": "compute-1", "uuid" : "010e7741-1173-4a3b-88fa-c4e5905500ca"}' - -count=$((count + 1)) - -echo $banner -echo "$count Delete Host Services" -echo $banner -curl -i -X DELETE -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/hosts/$hostuuid - -count=$((count + 1)) - -echo $banner -echo "$count Enable Guest Service: Instance 1" -echo $banner -curl -i -X PATCH -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104400 -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df104400", "channel" : "cgts-instance000001", "services" : [{"service":"heartbeat" , "state":"enabled"}]}' - -count=$((count + 1)) - -echo $banner -echo "$count Disable Guest Service: Instance 1" -echo $banner -curl -i -X PATCH -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104400 -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df104400", "channel" : "cgts-instance000001", "services" : [{"service":"heartbeat" , "state":"disabled"}]}' - -count=$((count + 1)) - -echo $banner -echo "$count Enable Guest Service: Instance 1 - Change Channel" -echo $banner -curl -i -X PATCH -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'User-Agent: vim/1.0' http://localhost:2410/v1/instances/8d80875b-fa73-4ccb-bce3-1cd4df104400 -d '{"hostname": "compute-1", "uuid" : "8d80875b-fa73-4ccb-bce3-1cd4df104400", "channel" : "cgts-instance000003", "services" : [{"service":"heartbeat" , "state":"enabled"}]}' - -echo $banner -echo $banner - -exit 0 diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer deleted file mode 100644 index 5e8d0877..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer +++ /dev/null @@ -1,113 +0,0 @@ -#! /bin/sh -# -# Copyright (c) 2013-2014, 2016 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# chkconfig: 2345 95 95 -# -### BEGIN INIT INFO -# Provides: guestServer -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: Maintenance Client Daemon -### END INIT INFO - -. /etc/init.d/functions - -DAEMON_NAME="guestServer" -DAEMON="/usr/local/bin/${DAEMON_NAME}" -PIDFILE="/var/run/${DAEMON_NAME}.pid" -PLATFORM_CONF="/etc/platform/platform.conf" - -IFACE="" - -# Linux Standard Base (LSB) Error Codes -RETVAL=0 -GENERIC_ERROR=1 -INVALID_ARGS=2 -UNSUPPORTED_FEATURE=3 -NOT_INSTALLED=5 -NOT_RUNNING=7 - -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin -export PATH - -if [ ! -e "${DAEMON}" ] ; then - logger "${DAEMON} is missing" - exit ${NOT_INSTALLED} -fi - -if [ -f ${PLATFORM_CONF} ] ; then - IFACE=`cat ${PLATFORM_CONF} | grep management_interface | cut -f2 -d'='` - if [ "${IFACE}" != "" ] ; then - if ip link show $IFACE | grep -sq 'state DOWN'; then - ip link set dev $IFACE up - fi - fi -fi - -case "$1" in - start) - logger "Starting ${DAEMON_NAME}" - echo -n "Starting ${DAEMON_NAME}: " - if [ -n "`pidof ${DAEMON_NAME}`" ] ; then - echo -n "is already running " - RETVAL=0 - else - start-stop-daemon --start -b -x ${DAEMON} -- -l - RETVAL=$? - fi - if [ ${RETVAL} -eq 0 ] ; then - pid=`pidof ${DAEMON_NAME}` - echo "OK" - logger "${DAEMON} (${pid})" - else - echo "FAIL" - RETVAL=${GENERIC_ERROR} - fi - ;; - - stop) - logger "Stopping ${DAEMON_NAME}" - echo -n "Stopping ${DAEMON_NAME}: " - if [ -n "`pidof ${DAEMON_NAME}`" ] ; then - killproc ${DAEMON_NAME} - fi - if [ -n "`pidof ${DAEMON_NAME}`" ] ; then - echo "FAIL" - RETVAL=${NOT_RUNNING} - else - echo "OK" - fi - rm -f ${PIDFILE} - ;; - - restart) - $0 stop - $0 start - ;; - - status) - pid=`pidof ${DAEMON_NAME}` - RETVAL=$? - if [ ${RETVAL} -eq 0 ] ; then - echo "${DAEMON_NAME} is running" - else - echo "${DAEMON_NAME} is NOT running" - RETVAL=${NOT_RUNNING} - fi - ;; - - condrestart) - $0 restart - ;; - - *) - echo "usage: $0 { start | stop | status | restart | condrestart | status }" - ;; -esac - -exit ${RETVAL} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.logrotate b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.logrotate deleted file mode 100644 index 9b54a875..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.logrotate +++ /dev/null @@ -1,17 +0,0 @@ -#daily -nodateext - -/var/log/guestServer.log -{ - nodateext - size 10M - rotate 5 - start 1 - missingok - notifempty - compress - sharedscripts - postrotate - systemctl reload syslog-ng > /dev/null 2>&1 || true - endscript -} diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.pmon b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.pmon deleted file mode 100644 index a19ce303..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.pmon +++ /dev/null @@ -1,25 +0,0 @@ -[process] -process = guestServer -service = guestServer -pidfile = /var/run/guestServer.pid -script = /etc/init.d/guestServer -style = lsb ; ocf or lsb -severity = major ; minor, major, critical -restarts = 3 ; restart retries before error assertion -interval = 3 ; number of seconds to wait between restarts -debounce = 10 ; number of seconds that a process needs to remain - ; running before degrade is removed and retry count - ; is cleared. -startuptime = 1 ; Seconds to wait after process start before starting the debounce monitor -mode = passive ; Monitoring mode: passive (default) or active - ; passive: process death monitoring (default: always) - ; active : heartbeat monitoring, i.e. request / response messaging - ; ignore : do not monitor or stop monitoring -subfunction = compute ; Optional label. - ; Manage this process in the context of a combo host subfunction - ; Choices: compute or storage. - ; when specified pmond will wait for - ; /var/run/.compute_config_complete or - ; /var/run/.storage_config_complete - ; ... before managing this process with the specified subfunction - ; Excluding this label will cause this process to be managed by default on startup diff --git a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.service b/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.service deleted file mode 100644 index 6e2dd3a2..00000000 --- a/mtce-common/cgts-mtce-common-1.0/guest/scripts/guestServer.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Titanium Cloud Maintenance Guest Heartbeat Monitor Server -After=network.target syslog.service config.service -Before=pmon.service - -[Service] -Type=forking -ExecStart=/etc/rc.d/init.d/guestServer start -ExecStop=/etc/rc.d/init.d/guestServer stop -ExecReload=/etc/rc.d/init.d/guestServer reload -PIDFile=/var/run/guestServer.pid - -# Failure handling -TimeoutStartSec=10s -TimeoutStopSec=10s - -# process recovery is handled by pmond -Restart=no -RestartSec=5 - -[Install] -WantedBy=multi-user.target - diff --git a/mtce-common/cgts-mtce-common-1.0/.gitignore b/mtce-common/src/.gitignore similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/.gitignore rename to mtce-common/src/.gitignore diff --git a/mtce-common/LICENSE b/mtce-common/src/LICENSE similarity index 100% rename from mtce-common/LICENSE rename to mtce-common/src/LICENSE diff --git a/mtce-common/src/Makefile b/mtce-common/src/Makefile new file mode 100755 index 00000000..74551d63 --- /dev/null +++ b/mtce-common/src/Makefile @@ -0,0 +1,18 @@ +# +# Copyright (c) 2013-2018 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +VER=1 +VER_MJR=1 + +build: + @(cd daemon ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) + @(cd common ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) + +clean: + @( cd daemon ; make clean ) + @( cd common ; make clean ) + @( rm -rf release ) + diff --git a/mtce-common/cgts-mtce-common-1.0/common/Makefile b/mtce-common/src/common/Makefile similarity index 87% rename from mtce-common/cgts-mtce-common-1.0/common/Makefile rename to mtce-common/src/common/Makefile index f8d2962f..dc8993e6 100755 --- a/mtce-common/cgts-mtce-common-1.0/common/Makefile +++ b/mtce-common/src/common/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2016 Wind River Systems, Inc. +# Copyright (c) 2013-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -10,7 +10,6 @@ SRCS = regexUtil.cpp \ pingUtil.cpp \ keyClass.cpp \ hostClass.cpp \ - nodeClass.cpp \ nodeBase.cpp \ nodeTimers.cpp \ nodeUtil.cpp \ @@ -27,9 +26,7 @@ COMMON_OBJS = regexUtil.o \ timeUtil.o \ pingUtil.o \ keyClass.o \ - keyClass.cpp \ hostClass.o \ - nodeClass.o \ nodeBase.o \ nodeTimers.o \ nodeUtil.o \ @@ -45,7 +42,7 @@ COMMON_OBJS = regexUtil.o \ OBJS = $(SRCS:.cpp=.o) LDLIBS += -lstdc++ -ldaemon -lcommon -lfmcommon -lrt -lpq -levent -ljson-c -lcrypto -luuid -INCLUDES = -I../daemon -I../alarm -I../maintenance -I../heartbeat -I.. -I. +INCLUDES = -I. -I../daemon CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11 STATIC_ANALYSIS_TOOL = cppcheck @@ -84,8 +81,5 @@ library: testhead: $(CCFLAGS) $(INCLUDES) -L../daemon -L../common -L. $(LDLIBS) -lpingUtil -lnodeBase -lregexUtil -lhostUtil -fsync: fsync.o - $(CC) fsync.o -L../daemon -L../common -L. -ldaemon -lcommon -o fsync - clean: - @rm -f *.o *.a fsync *.o + @rm -v -f *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/common/alarmUtil.cpp b/mtce-common/src/common/alarmUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/alarmUtil.cpp rename to mtce-common/src/common/alarmUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/alarmUtil.h b/mtce-common/src/common/alarmUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/alarmUtil.h rename to mtce-common/src/common/alarmUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/fitCodes.h b/mtce-common/src/common/fitCodes.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/fitCodes.h rename to mtce-common/src/common/fitCodes.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/hostClass.cpp b/mtce-common/src/common/hostClass.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/hostClass.cpp rename to mtce-common/src/common/hostClass.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/hostClass.h b/mtce-common/src/common/hostClass.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/hostClass.h rename to mtce-common/src/common/hostClass.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/hostUtil.cpp b/mtce-common/src/common/hostUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/hostUtil.cpp rename to mtce-common/src/common/hostUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/hostUtil.h b/mtce-common/src/common/hostUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/hostUtil.h rename to mtce-common/src/common/hostUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/httpUtil.cpp b/mtce-common/src/common/httpUtil.cpp similarity index 99% rename from mtce-common/cgts-mtce-common-1.0/common/httpUtil.cpp rename to mtce-common/src/common/httpUtil.cpp index 1370ecc8..469d945a 100644 --- a/mtce-common/cgts-mtce-common-1.0/common/httpUtil.cpp +++ b/mtce-common/src/common/httpUtil.cpp @@ -19,7 +19,6 @@ using namespace std; #include "jsonUtil.h" #include "tokenUtil.h" /* for ... tokenUtil_handler */ #include "nodeUtil.h" /* for ... string_contains */ -#include "nodeClass.h" #include "timeUtil.h" /* for ... time_debug_type */ #include "keyClass.h" /* for ... add_key, del_key */ diff --git a/mtce-common/cgts-mtce-common-1.0/common/httpUtil.h b/mtce-common/src/common/httpUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/httpUtil.h rename to mtce-common/src/common/httpUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/ipmiUtil.cpp b/mtce-common/src/common/ipmiUtil.cpp similarity index 99% rename from mtce-common/cgts-mtce-common-1.0/common/ipmiUtil.cpp rename to mtce-common/src/common/ipmiUtil.cpp index 7cc0e05b..7672dae4 100644 --- a/mtce-common/cgts-mtce-common-1.0/common/ipmiUtil.cpp +++ b/mtce-common/src/common/ipmiUtil.cpp @@ -17,7 +17,6 @@ using namespace std; #include "nodeBase.h" /* for ... mtce node common definitions */ #include "hostUtil.h" /* for ... mtce host common definitions */ #include "ipmiUtil.h" /* for ... this module header */ -#include "nodeClass.h" /* for ... */ /* Create a randomly named password filename */ void ipmiUtil_create_pw_fn ( thread_info_type * info_ptr, string pw ) diff --git a/mtce-common/cgts-mtce-common-1.0/common/ipmiUtil.h b/mtce-common/src/common/ipmiUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/ipmiUtil.h rename to mtce-common/src/common/ipmiUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/jsonUtil.cpp b/mtce-common/src/common/jsonUtil.cpp similarity index 99% rename from mtce-common/cgts-mtce-common-1.0/common/jsonUtil.cpp rename to mtce-common/src/common/jsonUtil.cpp index ee84ce7c..2a315b16 100644 --- a/mtce-common/cgts-mtce-common-1.0/common/jsonUtil.cpp +++ b/mtce-common/src/common/jsonUtil.cpp @@ -24,7 +24,6 @@ using namespace std; #endif #define __AREA__ "jsn" -#include "nodeClass.h" #include "nodeUtil.h" #include "jsonUtil.h" /* JSON Utilities */ diff --git a/mtce-common/cgts-mtce-common-1.0/common/jsonUtil.h b/mtce-common/src/common/jsonUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/jsonUtil.h rename to mtce-common/src/common/jsonUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/keyClass.cpp b/mtce-common/src/common/keyClass.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/keyClass.cpp rename to mtce-common/src/common/keyClass.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/keyClass.h b/mtce-common/src/common/keyClass.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/keyClass.h rename to mtce-common/src/common/keyClass.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/logMacros.h b/mtce-common/src/common/logMacros.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/logMacros.h rename to mtce-common/src/common/logMacros.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/msgClass.cpp b/mtce-common/src/common/msgClass.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/msgClass.cpp rename to mtce-common/src/common/msgClass.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/msgClass.h b/mtce-common/src/common/msgClass.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/msgClass.h rename to mtce-common/src/common/msgClass.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/nlEvent.cpp b/mtce-common/src/common/nlEvent.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nlEvent.cpp rename to mtce-common/src/common/nlEvent.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/nlEvent.h b/mtce-common/src/common/nlEvent.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nlEvent.h rename to mtce-common/src/common/nlEvent.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeBase.cpp b/mtce-common/src/common/nodeBase.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeBase.cpp rename to mtce-common/src/common/nodeBase.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeBase.h b/mtce-common/src/common/nodeBase.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeBase.h rename to mtce-common/src/common/nodeBase.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeEvent.cpp b/mtce-common/src/common/nodeEvent.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeEvent.cpp rename to mtce-common/src/common/nodeEvent.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeEvent.h b/mtce-common/src/common/nodeEvent.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeEvent.h rename to mtce-common/src/common/nodeEvent.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeMacro.h b/mtce-common/src/common/nodeMacro.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeMacro.h rename to mtce-common/src/common/nodeMacro.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeTimers.cpp b/mtce-common/src/common/nodeTimers.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeTimers.cpp rename to mtce-common/src/common/nodeTimers.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeTimers.h b/mtce-common/src/common/nodeTimers.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeTimers.h rename to mtce-common/src/common/nodeTimers.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeUtil.cpp b/mtce-common/src/common/nodeUtil.cpp similarity index 99% rename from mtce-common/cgts-mtce-common-1.0/common/nodeUtil.cpp rename to mtce-common/src/common/nodeUtil.cpp index 945fa978..73a75697 100755 --- a/mtce-common/cgts-mtce-common-1.0/common/nodeUtil.cpp +++ b/mtce-common/src/common/nodeUtil.cpp @@ -37,7 +37,6 @@ using namespace std; #include "nodeBase.h" -#include "nodeClass.h" #include "nodeUtil.h" #include "daemon_common.h" #include "msgClass.h" @@ -355,21 +354,6 @@ void dump_memory ( void * raw_ptr , int format, size_t bytes ) } -/** Initialize the supplied command buffer */ -void mtcCmd_init ( mtcCmd & cmd ) -{ - cmd.cmd = 0 ; - cmd.rsp = 0 ; - cmd.ack = 0 ; - cmd.retry = 0 ; - cmd.parm1 = 0 ; - cmd.parm2 = 0 ; - cmd.task = false ; - cmd.status = RETRY ; - cmd.status_string.clear(); - cmd.name.clear(); -} - char hostname_floating [] = { "controller" } ; string getipbyiface ( const char * iface ) diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeUtil.h b/mtce-common/src/common/nodeUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeUtil.h rename to mtce-common/src/common/nodeUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/pgdbClass.cpp.OBS b/mtce-common/src/common/pgdbClass.cpp.OBS similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/pgdbClass.cpp.OBS rename to mtce-common/src/common/pgdbClass.cpp.OBS diff --git a/mtce-common/cgts-mtce-common-1.0/common/pgdbClass.h.OBS b/mtce-common/src/common/pgdbClass.h.OBS similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/pgdbClass.h.OBS rename to mtce-common/src/common/pgdbClass.h.OBS diff --git a/mtce-common/cgts-mtce-common-1.0/common/pgdbUtil.cpp.OBS b/mtce-common/src/common/pgdbUtil.cpp.OBS similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/pgdbUtil.cpp.OBS rename to mtce-common/src/common/pgdbUtil.cpp.OBS diff --git a/mtce-common/cgts-mtce-common-1.0/common/pingUtil.cpp b/mtce-common/src/common/pingUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/pingUtil.cpp rename to mtce-common/src/common/pingUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/pingUtil.h b/mtce-common/src/common/pingUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/pingUtil.h rename to mtce-common/src/common/pingUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/regexUtil.cpp b/mtce-common/src/common/regexUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/regexUtil.cpp rename to mtce-common/src/common/regexUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/regexUtil.h b/mtce-common/src/common/regexUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/regexUtil.h rename to mtce-common/src/common/regexUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/returnCodes.h b/mtce-common/src/common/returnCodes.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/returnCodes.h rename to mtce-common/src/common/returnCodes.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/threadUtil.cpp b/mtce-common/src/common/threadUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/threadUtil.cpp rename to mtce-common/src/common/threadUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/threadUtil.h b/mtce-common/src/common/threadUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/threadUtil.h rename to mtce-common/src/common/threadUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/timeUtil.cpp b/mtce-common/src/common/timeUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/timeUtil.cpp rename to mtce-common/src/common/timeUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/timeUtil.h b/mtce-common/src/common/timeUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/timeUtil.h rename to mtce-common/src/common/timeUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/common/tokenUtil.cpp b/mtce-common/src/common/tokenUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/tokenUtil.cpp rename to mtce-common/src/common/tokenUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/common/tokenUtil.h b/mtce-common/src/common/tokenUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/tokenUtil.h rename to mtce-common/src/common/tokenUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/Makefile b/mtce-common/src/daemon/Makefile similarity index 92% rename from mtce-common/cgts-mtce-common-1.0/daemon/Makefile rename to mtce-common/src/daemon/Makefile index 707ae0b6..cccd18dd 100755 --- a/mtce-common/cgts-mtce-common-1.0/daemon/Makefile +++ b/mtce-common/src/daemon/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2015 Wind River Systems, Inc. +# Copyright (c) 2013-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -30,4 +30,4 @@ lib: build $(OBJS) build: clean static_analysis clean: - @rm -f $(OBJ) *.o *.a + @rm -v -f $(OBJ) *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_common.h b/mtce-common/src/daemon/daemon_common.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_common.h rename to mtce-common/src/daemon/daemon_common.h diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_config.cpp b/mtce-common/src/daemon/daemon_config.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_config.cpp rename to mtce-common/src/daemon/daemon_config.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_debug.cpp b/mtce-common/src/daemon/daemon_debug.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_debug.cpp rename to mtce-common/src/daemon/daemon_debug.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_files.cpp b/mtce-common/src/daemon/daemon_files.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_files.cpp rename to mtce-common/src/daemon/daemon_files.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_ini.cpp b/mtce-common/src/daemon/daemon_ini.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_ini.cpp rename to mtce-common/src/daemon/daemon_ini.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_ini.h b/mtce-common/src/daemon/daemon_ini.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_ini.h rename to mtce-common/src/daemon/daemon_ini.h diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_main.cpp b/mtce-common/src/daemon/daemon_main.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_main.cpp rename to mtce-common/src/daemon/daemon_main.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_option.h b/mtce-common/src/daemon/daemon_option.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_option.h rename to mtce-common/src/daemon/daemon_option.h diff --git a/mtce-common/cgts-mtce-common-1.0/daemon/daemon_signal.cpp b/mtce-common/src/daemon/daemon_signal.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/daemon/daemon_signal.cpp rename to mtce-common/src/daemon/daemon_signal.cpp diff --git a/mtce/PKG-INFO b/mtce/PKG-INFO new file mode 100644 index 00000000..102519cc --- /dev/null +++ b/mtce/PKG-INFO @@ -0,0 +1,15 @@ +Metadata-Version: 1.1 +Name: mtce +Version: 1.0 +Summary: Titanium Cloud Platform Common Node Maintenance Package +Home-page: +Author: Windriver +Author-email: info@windriver.com +License: Apache-2.0 + +Description: Maintenance common package containing host maintenace and heartbeat + agent/client daemons as well as the hardware and process monitor + daemons, hardware watchdog process, resource and file system daemons + as well as initialization and support files for each. + +Platform: UNKNOWN diff --git a/mtce/centos/build_srpm.data b/mtce/centos/build_srpm.data new file mode 100644 index 00000000..f8556950 --- /dev/null +++ b/mtce/centos/build_srpm.data @@ -0,0 +1,3 @@ +SRC_DIR="src" +TIS_PATCH_VER=139 +BUILD_IS_SLOW=5 diff --git a/mtce-common/centos/cgts-mtce-common.spec b/mtce/centos/mtce.spec similarity index 80% rename from mtce-common/centos/cgts-mtce-common.spec rename to mtce/centos/mtce.spec index a9310d36..98f72d78 100644 --- a/mtce-common/centos/cgts-mtce-common.spec +++ b/mtce/centos/mtce.spec @@ -1,5 +1,5 @@ Summary: Titanuim Server Common Maintenance Package -Name: cgts-mtce-common +Name: mtce Version: 1.0 Release: %{tis_patch_ver}%{?_tis_dist} License: Apache-2.0 @@ -26,12 +26,13 @@ BuildRequires: libuuid-devel BuildRequires: guest-client-devel BuildRequires: systemd-devel BuildRequires: cppcheck +BuildRequires: mtce-common-dev >= 1.0 Requires: util-linux Requires: /bin/bash Requires: /bin/systemctl Requires: dpkg Requires: time -Requires: cgts-mtce-common-rmon >= 1.0 +Requires: mtce-rmon >= 1.0 Requires: libevent-2.0.so.5()(64bit) Requires: expect Requires: libfmcommon.so.1()(64bit) @@ -42,7 +43,7 @@ Requires: libamon.so.1()(64bit) Requires: libc.so.6(GLIBC_2.2.5)(64bit) Requires: libstdc++.so.6(GLIBCXX_3.4.11)(64bit) Requires: /bin/sh -Requires: cgts-mtce-common-pmon >= 1.0 +Requires: mtce-pmon >= 1.0 Requires: librt.so.1()(64bit) Requires: libc.so.6(GLIBC_2.3)(64bit) Requires: libc.so.6(GLIBC_2.14)(64bit) @@ -81,16 +82,15 @@ Service (fsmond) adds detection and reporting of local file system problems. The Hardware Monitor Service (hwmond) adds present and predictive hardware failure detection, reporting and recovery. The Resource Monitor Service (rmond) adds resource monitoring with present and predictive -failure and overload detection and reporting. The Guest Services -(guestAgent/guestServer) daemons control access into and heartbeat of guest -VMs on the compute. The Host Watchdog (hostwd) daemon watches for errors in +failure and overload detection and reporting. +The Host Watchdog (hostwd) daemon watches for errors in pmond and logs system information on error. All of these maintenance services improve MTTD of node failures as well as resource overload and out of spec operating conditions that can reduce outage time through automated notification and recovery thereby improving overall platform availability for the customer. -%package -n cgts-mtce-common-pmon +%package -n mtce-pmon Summary: Titanuim Server Maintenance Process Monitor Package Group: base BuildRequires: cppcheck @@ -124,12 +124,12 @@ Requires: libstdc++.so.6(GLIBCXX_3.4.15)(64bit) Requires: libpthread.so.0()(64bit) Provides: libamon.so.1()(64bit) -%description -n cgts-mtce-common-pmon +%description -n mtce-pmon Titanium Cloud Maintenance Process Monitor service (pmond) with passive (pid), active (msg) and status (qry) process monitoring with automatic recovery and failure reporting of registered failed processes. -%package -n cgts-mtce-common-rmon +%package -n mtce-rmon Summary: Titanuim Server Maintenance Resource Monitor Package Group: base Requires: /bin/bash @@ -165,13 +165,13 @@ Requires: libstdc++.so.6(GLIBCXX_3.4.15)(64bit) Requires: libpthread.so.0()(64bit) Provides: librmonapi.so.1()(64bit) -%description -n cgts-mtce-common-rmon +%description -n mtce-rmon Titanium Cloud Host Maintenance Resource Monitor Service (rmond) adds threshold based monitoring with predictive severity level alarming for out of tolerance utilization of critical resourses such as memory, cpu file system, interface state, etc. -%package -n cgts-mtce-common-hwmon +%package -n mtce-hwmon Summary: Titanuim Server Maintenance Hardware Monitor Package Group: base Requires: dpkg @@ -205,88 +205,12 @@ Requires: libstdc++.so.6(GLIBCXX_3.4)(64bit) Requires: libstdc++.so.6(GLIBCXX_3.4.15)(64bit) Requires: libpthread.so.0()(64bit) -%description -n cgts-mtce-common-hwmon +%description -n mtce-hwmon Titanium Cloud Host Maintenance Hardware Monitor Service (hwmond) adds in and out of service hardware sensor monitoring, alarming and recovery handling. -%package -n cgts-mtce-common-guestAgent -Summary: Titanuim Server Maintenance Guest Agent Package -Group: base -Requires: dpkg -Requires: time -Requires: libjson-c.so.2()(64bit) -Requires: libstdc++.so.6(CXXABI_1.3)(64bit) -Requires: librt.so.1(GLIBC_2.2.5)(64bit) -Requires: libfmcommon.so.1()(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4.9)(64bit) -Requires: fm-common >= 1.0 -Requires: libc.so.6(GLIBC_2.2.5)(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4.11)(64bit) -Requires: /bin/sh -Requires: librt.so.1()(64bit) -Requires: libc.so.6(GLIBC_2.3)(64bit) -Requires: libc.so.6(GLIBC_2.14)(64bit) -Requires: libpthread.so.0(GLIBC_2.2.5)(64bit) -Requires: librt.so.1(GLIBC_2.3.3)(64bit) -Requires: libgcc_s.so.1(GCC_3.0)(64bit) -Requires: libevent >= 2.0.21 -Requires: libevent-2.0.so.5()(64bit) -Requires: libuuid.so.1()(64bit) -Requires: libm.so.6()(64bit) -Requires: rtld(GNU_HASH) -Requires: libstdc++.so.6()(64bit) -Requires: libc.so.6()(64bit) -Requires: libgcc_s.so.1()(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4)(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4.15)(64bit) -Requires: libpthread.so.0()(64bit) - -%description -n cgts-mtce-common-guestAgent -Titanium Cloud Host Maintenance Guest Agent Service assists in -VM guest heartbeat control and failure reporting at the controller -level. - -%package -n cgts-mtce-common-guestServer -Summary: Titanuim Server Maintenance Guest Server Package -Group: base -Requires: util-linux -Requires: /bin/bash -Requires: /bin/systemctl -Requires: dpkg -Requires: libjson-c.so.2()(64bit) -Requires: libstdc++.so.6(CXXABI_1.3)(64bit) -Requires: librt.so.1(GLIBC_2.2.5)(64bit) -Requires: libfmcommon.so.1()(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4.9)(64bit) -Requires: fm-common >= 1.0 -Requires: libc.so.6(GLIBC_2.2.5)(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4.11)(64bit) -Requires: /bin/sh -Requires: librt.so.1()(64bit) -Requires: libc.so.6(GLIBC_2.3)(64bit) -Requires: libc.so.6(GLIBC_2.14)(64bit) -Requires: libpthread.so.0(GLIBC_2.2.5)(64bit) -Requires: librt.so.1(GLIBC_2.3.3)(64bit) -Requires: libgcc_s.so.1(GCC_3.0)(64bit) -Requires: libevent >= 2.0.21 -Requires: libevent-2.0.so.5()(64bit) -Requires: libuuid.so.1()(64bit) -Requires: libm.so.6()(64bit) -Requires: rtld(GNU_HASH) -Requires: libstdc++.so.6()(64bit) -Requires: libc.so.6(GLIBC_2.4)(64bit) -Requires: libc.so.6()(64bit) -Requires: libgcc_s.so.1()(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4)(64bit) -Requires: libstdc++.so.6(GLIBCXX_3.4.15)(64bit) -Requires: libpthread.so.0()(64bit) - -%description -n cgts-mtce-common-guestServer -Titanium Cloud Maintenance Guest Server assists in VM guest -heartbeat control and failure reporting at the compute level. - -%package -n cgts-mtce-common-hostw +%package -n mtce-hostw Summary: Titanuim Server Common Maintenance Package Group: base Requires: util-linux @@ -311,7 +235,7 @@ Requires: libstdc++.so.6(GLIBCXX_3.4)(64bit) Requires: libstdc++.so.6(GLIBCXX_3.4.15)(64bit) Requires: libpthread.so.0()(64bit) -%description -n cgts-mtce-common-hostw +%description -n mtce-hostw Titanium Cloud Host Maintenance services. A suite of daemons that provide host maintainability and a high level of fault detection with automatic notification and recovery.The Maintenance Service (mtcAgent/mtcClient) @@ -347,21 +271,21 @@ for the customer. %prep %setup -# Build for main cgts-mtce-common package +# Build mtce package %build VER=%{version} -MAJOR=`echo $VER | awk -F . '{print $1}'` -MINOR=`echo $VER | awk -F . '{print $2}'` +MAJOR=$(echo $VER | awk -F . '{print $1}') +MINOR=$(echo $VER | awk -F . '{print $2}') make MAJOR=$MAJOR MINOR=$MINOR %{?_smp_mflags} build %global _buildsubdir %{_builddir}/%{name}-%{version} -# Install for main cgts-mtce-common package +# Install mtce package %install VER=%{version} -MAJOR=`echo $VER | awk -F . '{print $1}'` -MINOR=`echo $VER | awk -F . '{print $2}'` +MAJOR=$(echo $VER | awk -F . '{print $1}') +MINOR=$(echo $VER | awk -F . '{print $2}') install -m 755 -d %{buildroot}%{_sysconfdir} install -m 755 -d %{buildroot}/usr @@ -382,7 +306,6 @@ install -m 755 -d %{buildroot}/usr/lib/ocf/resource.d/platform install -m 755 -p -D %{_buildsubdir}/scripts/mtcAgent %{buildroot}/usr/lib/ocf/resource.d/platform/mtcAgent install -m 755 -p -D %{_buildsubdir}/scripts/hbsAgent %{buildroot}/usr/lib/ocf/resource.d/platform/hbsAgent install -m 755 -p -D %{_buildsubdir}/hwmon/scripts/ocf/hwmon %{buildroot}/usr/lib/ocf/resource.d/platform/hwmon -install -m 755 -p -D %{_buildsubdir}/guest/scripts/guestAgent.ocf %{buildroot}/usr/lib/ocf/resource.d/platform/guestAgent # config files install -m 644 -p -D %{_buildsubdir}/scripts/mtc.ini %{buildroot}%{_sysconfdir}/mtc.ini @@ -391,8 +314,6 @@ install -m 644 -p -D %{_buildsubdir}/fsmon/scripts/fsmond.conf %{buildroot}%{_sy install -m 644 -p -D %{_buildsubdir}/hwmon/scripts/hwmond.conf %{buildroot}%{_sysconfdir}/mtc/hwmond.conf install -m 644 -p -D %{_buildsubdir}/pmon/scripts/pmond.conf %{buildroot}%{_sysconfdir}/mtc/pmond.conf install -m 644 -p -D %{_buildsubdir}/rmon/scripts/rmond.conf %{buildroot}%{_sysconfdir}/mtc/rmond.conf -install -m 644 -p -D %{_buildsubdir}/guest/scripts/guest.ini %{buildroot}%{_sysconfdir}/mtc/guestAgent.ini -install -m 644 -p -D %{_buildsubdir}/guest/scripts/guest.ini %{buildroot}%{_sysconfdir}/mtc/guestServer.ini install -m 644 -p -D %{_buildsubdir}/hostw/scripts/hostwd.conf %{buildroot}%{_sysconfdir}/mtc/hostwd.conf install -m 755 -d %{buildroot}/%{_sysconfdir}/etc/bmc/server_profiles.d @@ -405,8 +326,6 @@ install -m 755 -p -D %{_buildsubdir}/maintenance/mtcAgent %{buildroot}/%{local_b install -m 755 -p -D %{_buildsubdir}/maintenance/mtcClient %{buildroot}/%{local_bindir}/mtcClient install -m 755 -p -D %{_buildsubdir}/heartbeat/hbsAgent %{buildroot}/%{local_bindir}/hbsAgent install -m 755 -p -D %{_buildsubdir}/heartbeat/hbsClient %{buildroot}/%{local_bindir}/hbsClient -install -m 755 -p -D %{_buildsubdir}/guest/guestServer %{buildroot}/%{local_bindir}/guestServer -install -m 755 -p -D %{_buildsubdir}/guest/guestAgent %{buildroot}/%{local_bindir}/guestAgent install -m 755 -p -D %{_buildsubdir}/pmon/pmond %{buildroot}/%{local_bindir}/pmond install -m 755 -p -D %{_buildsubdir}/hostw/hostwd %{buildroot}/%{local_bindir}/hostwd install -m 755 -p -D %{_buildsubdir}/rmon/rmond %{buildroot}/%{local_bindir}/rmond @@ -416,7 +335,7 @@ install -m 755 -p -D %{_buildsubdir}/mtclog/mtclogd %{buildroot}/%{local_bindir} install -m 755 -p -D %{_buildsubdir}/alarm/mtcalarmd %{buildroot}/%{local_bindir}/mtcalarmd install -m 755 -p -D %{_buildsubdir}/rmon/rmon_resource_notify/rmon_resource_notify %{buildroot}/%{local_bindir}/rmon_resource_notify install -m 755 -p -D %{_buildsubdir}/scripts/wipedisk %{buildroot}/%{local_bindir}/wipedisk -install -m 755 -p -D %{_buildsubdir}/common/fsync %{buildroot}/%{_sbindir}/fsync +install -m 755 -p -D %{_buildsubdir}/fsync/fsync %{buildroot}/%{_sbindir}/fsync install -m 700 -p -D %{_buildsubdir}/pmon/scripts/pmon-restart %{buildroot}/%{local_sbindir}/pmon-restart install -m 700 -p -D %{_buildsubdir}/pmon/scripts/pmon-start %{buildroot}/%{local_sbindir}/pmon-start install -m 700 -p -D %{_buildsubdir}/pmon/scripts/pmon-stop %{buildroot}/%{local_sbindir}/pmon-stop @@ -424,8 +343,6 @@ install -m 700 -p -D %{_buildsubdir}/pmon/scripts/pmon-stop %{buildroot}/%{local # init script files install -m 755 -p -D %{_buildsubdir}/scripts/mtcClient %{buildroot}%{_sysconfdir}/init.d/mtcClient install -m 755 -p -D %{_buildsubdir}/scripts/hbsClient %{buildroot}%{_sysconfdir}/init.d/hbsClient -install -m 755 -p -D %{_buildsubdir}/guest/scripts/guestServer %{buildroot}%{_sysconfdir}/init.d/guestServer -install -m 755 -p -D %{_buildsubdir}/guest/scripts/guestAgent %{buildroot}%{_sysconfdir}/init.d/guestAgent install -m 755 -p -D %{_buildsubdir}/hwmon/scripts/lsb/hwmon %{buildroot}%{_sysconfdir}/init.d/hwmon install -m 755 -p -D %{_buildsubdir}/fsmon/scripts/fsmon %{buildroot}%{_sysconfdir}/init.d/fsmon install -m 755 -p -D %{_buildsubdir}/scripts/mtclog %{buildroot}%{_sysconfdir}/init.d/mtclog @@ -446,8 +363,6 @@ install -m 644 -p -D %{_buildsubdir}/hwmon/scripts/hwmon.service %{buildroot}%{_ install -m 644 -p -D %{_buildsubdir}/rmon/scripts/rmon.service %{buildroot}%{_unitdir}/rmon.service install -m 644 -p -D %{_buildsubdir}/pmon/scripts/pmon.service %{buildroot}%{_unitdir}/pmon.service install -m 644 -p -D %{_buildsubdir}/hostw/scripts/hostw.service %{buildroot}%{_unitdir}/hostw.service -install -m 644 -p -D %{_buildsubdir}/guest/scripts/guestServer.service %{buildroot}%{_unitdir}/guestServer.service -install -m 644 -p -D %{_buildsubdir}/guest/scripts/guestAgent.service %{buildroot}%{_unitdir}/guestAgent.service install -m 644 -p -D %{_buildsubdir}/scripts/mtcClient.service %{buildroot}%{_unitdir}/mtcClient.service install -m 644 -p -D %{_buildsubdir}/scripts/hbsClient.service %{buildroot}%{_unitdir}/hbsClient.service install -m 644 -p -D %{_buildsubdir}/scripts/mtclog.service %{buildroot}%{_unitdir}/mtclog.service @@ -483,7 +398,6 @@ install -m 644 -p -D %{_buildsubdir}/pmon/scripts/nslcd.conf %{buildroot}%{local install -m 644 -p -D %{_buildsubdir}/rmon/scripts/rmon.conf %{buildroot}%{local_etc_pmond}/rmon.conf install -m 644 -p -D %{_buildsubdir}/fsmon/scripts/fsmon.conf %{buildroot}%{local_etc_pmond}/fsmon.conf install -m 644 -p -D %{_buildsubdir}/scripts/mtclogd.conf %{buildroot}%{local_etc_pmond}/mtclogd.conf -install -m 644 -p -D %{_buildsubdir}/guest/scripts/guestServer.pmon %{buildroot}%{local_etc_pmond}/guestServer.conf install -m 644 -p -D %{_buildsubdir}/alarm/scripts/mtcalarm.pmon.conf %{buildroot}%{local_etc_pmond}/mtcalarm.conf # resource monitor config files @@ -508,8 +422,6 @@ install -m 644 -p -D %{_buildsubdir}/pmon/scripts/pmon.logrotate %{buildroot}%{l install -m 644 -p -D %{_buildsubdir}/rmon/scripts/rmon.logrotate %{buildroot}%{local_etc_logrotated}/rmon.logrotate install -m 644 -p -D %{_buildsubdir}/fsmon/scripts/fsmon.logrotate %{buildroot}%{local_etc_logrotated}/fsmon.logrotate install -m 644 -p -D %{_buildsubdir}/hwmon/scripts/hwmon.logrotate %{buildroot}%{local_etc_logrotated}/hwmon.logrotate -install -m 644 -p -D %{_buildsubdir}/guest/scripts/guestAgent.logrotate %{buildroot}%{local_etc_logrotated}/guestAgent.logrotate -install -m 644 -p -D %{_buildsubdir}/guest/scripts/guestServer.logrotate %{buildroot}%{local_etc_logrotated}/guestServer.logrotate install -m 644 -p -D %{_buildsubdir}/alarm/scripts/mtcalarm.logrotate %{buildroot}%{local_etc_logrotated}/mtcalarm.logrotate install -m 755 -p -D %{_buildsubdir}/public/libamon.so.$MAJOR %{buildroot}%{_libdir}/libamon.so.$MAJOR @@ -520,6 +432,7 @@ install -m 755 -p -D %{_buildsubdir}/rmon/rmonApi/librmonapi.so.$MAJOR %{buildro cd %{buildroot}%{_libdir} ; ln -s librmonapi.so.$MAJOR librmonapi.so.$MAJOR.$MINOR cd %{buildroot}%{_libdir} ; ln -s librmonapi.so.$MAJOR librmonapi.so +# volatile directories install -m 755 -d %{buildroot}/var install -m 755 -d %{buildroot}/var/run @@ -534,26 +447,21 @@ install -m 755 -d %{buildroot}/var/run /bin/systemctl enable goenabled.service /bin/systemctl enable mtcalarm.service -%post -n cgts-mtce-common-hostw +%post -n mtce-hostw /bin/systemctl enable hostw.service -%post -n cgts-mtce-common-pmon +%post -n mtce-pmon /bin/systemctl enable pmon.service -%post -n cgts-mtce-common-guestServer -/bin/systemctl enable guestServer.service - -%post -n cgts-mtce-common-rmon +%post -n mtce-rmon /bin/systemctl enable rmon.service ############################### -# Maintenance Common RPM Files +# Maintenance RPM Files ############################### - %files %license LICENSE - %defattr(-,root,root,-) # create the mtc and its tmp dir @@ -582,7 +490,6 @@ install -m 755 -d %{buildroot}/var/run %{local_etc_pmond}/mtcalarm.conf %{local_etc_pmond}/nslcd.conf - # Maintenance log rotation config files %{local_etc_logrotated}/fsmon.logrotate %{local_etc_logrotated}/mtce.logrotate @@ -632,8 +539,7 @@ install -m 755 -d %{buildroot}/var/run ############################### # Process Monitor RPM Files ############################### -%files -n cgts-mtce-common-pmon - +%files -n mtce-pmon %defattr(-,root,root,-) # Config files - Non-Modifiable @@ -645,9 +551,9 @@ install -m 755 -d %{buildroot}/var/run %{local_sbindir}/pmon-start %{local_sbindir}/pmon-stop -/usr/lib64/libamon.so.1.0 -/usr/lib64/libamon.so.1 -/usr/lib64/libamon.so +%{_libdir}/libamon.so.1.0 +%{_libdir}/libamon.so.1 +%{_libdir}/libamon.so %{_sysconfdir}/init.d/pmon %{local_bindir}/pmond @@ -655,8 +561,7 @@ install -m 755 -d %{buildroot}/var/run ############################### # Resource Monitor RPM Files ############################### -%files -n cgts-mtce-common-rmon - +%files -n mtce-rmon %defattr(-,root,root,-) # Config files - Non-Modifiable @@ -675,9 +580,9 @@ install -m 755 -d %{buildroot}/var/run %{_sysconfdir}/rmon_interfaces.d/infrastructure_resource.conf %{_sysconfdir}/rmonfiles.d/query_ntp_servers.sh -/usr/lib64/librmonapi.so.1.0 -/usr/lib64/librmonapi.so.1 -/usr/lib64/librmonapi.so +%{_libdir}/librmonapi.so.1.0 +%{_libdir}/librmonapi.so.1 +%{_libdir}/librmonapi.so %dir %{_sysconfdir}/rmonapi.d @@ -689,8 +594,7 @@ install -m 755 -d %{buildroot}/var/run ############################### # Hardware Monitor RPM Files ############################### -%files -n cgts-mtce-common-hwmon - +%files -n mtce-hwmon %defattr(-,root,root,-) # Config files - Non-Modifiable @@ -703,46 +607,10 @@ install -m 755 -d %{buildroot}/var/run %{_sysconfdir}/init.d/hwmon %{local_bindir}/hwmond -############################### -# Guest Agent RPM Files -############################### -%files -n cgts-mtce-common-guestAgent - -%defattr(-,root,root,-) - -# Config files - Non-Modifiable -%{_sysconfdir}/mtc/guestAgent.ini - -%{_unitdir}/guestAgent.service -%{local_etc_logrotated}/guestAgent.logrotate -%{ocf_resourced}/platform/guestAgent - -%{_sysconfdir}/init.d/guestAgent -%{local_bindir}/guestAgent - -############################### -# Guest Server RPM Files -############################### -%files -n cgts-mtce-common-guestServer - -%defattr(-,root,root,-) - -# Config files - Non-Modifiable -%{_sysconfdir}/mtc/guestServer.ini - -%{local_etc_pmond}/guestServer.conf -%{local_etc_logrotated}/guestServer.logrotate -%{_unitdir}/guestServer.service - -%{_sysconfdir}/init.d/guestServer -%{local_bindir}/guestServer - - ############################### # Host Watchdog RPM Files ############################### -%files -n cgts-mtce-common-hostw - +%files -n mtce-hostw %defattr(-,root,root,-) # Config files - Non-Modifiable @@ -752,3 +620,4 @@ install -m 755 -d %{buildroot}/var/run %{_unitdir}/hostw.service %{_sysconfdir}/init.d/hostw %{local_bindir}/hostwd + diff --git a/mtce-common/cgts-mtce-common-1.0/LICENSE b/mtce/src/LICENSE similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/LICENSE rename to mtce/src/LICENSE diff --git a/mtce/src/Makefile b/mtce/src/Makefile new file mode 100755 index 00000000..e4587181 --- /dev/null +++ b/mtce/src/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (c) 2013-2018 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +VER=1 +VER_MJR=1 + +build: + (cd public ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) + (cd rmon/rmonApi ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) + (cd common ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) + (cd alarm ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd heartbeat ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd maintenance ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd hwmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd mtclog ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd pmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd fsmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd rmon ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd rmon/rmon_resource_notify ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd hostw ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + (cd fsync ; make build VER=$(VER) VER_MJR=$(VER_MJR)) + +clean: + @( cd common ; make clean ) + @( cd public ; make clean ) + @( cd rmon/rmonApi ; make clean ) + @( cd alarm ; make clean ) + @( cd mtclog ; make clean ) + @( cd hwmon ; make clean ) + @( cd pmon ; make clean ) + @( cd fsmon ; make clean ) + @( cd heartbeat ; make clean ) + @( cd maintenance ; make clean ) + @( cd rmon ; make clean ) + @( cd rmon/rmon_resource_notify ; make clean ) + @( cd hostw ; make clean ) + @( cd fsync ; make clean ) + @( rm -rf release ) + +backup: clean + mkdir -p ~/mtce + cp -a * ~/mtce diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/Makefile b/mtce/src/alarm/Makefile similarity index 81% rename from mtce-common/cgts-mtce-common-1.0/alarm/Makefile rename to mtce/src/alarm/Makefile index 210de21b..9f02a716 100755 --- a/mtce-common/cgts-mtce-common-1.0/alarm/Makefile +++ b/mtce/src/alarm/Makefile @@ -1,7 +1,14 @@ +# +# Copyright (c) 2014-2018 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + SRCS = alarmInit.cpp alarmData.cpp alarmHdlr.cpp alarmMgr.cpp alarmUtil.cpp alarm.cpp OBJS = $(SRCS:.cpp=.o) LDLIBS = -lstdc++ -ldaemon -lcommon -lfmcommon -ljson-c -lrt -lcrypto -luuid -INCLUDES = -I../daemon -I../common -I../smash -I../maintenance -I../public -I. -I.. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I../smash -I../maintenance -I../public CCFLAGS = -g -O2 -Wall -Wextra -Werror STATIC_ANALYSIS_TOOL = cppcheck @@ -37,8 +44,8 @@ process: $(OBJS) $(CXX) $(CCFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) -o mtcalarmd clean_bins: - @rm -f $(BINS) + @rm -v -f $(BINS) clean: - @rm -f $(OBJ) $(BINS) *.o *.a + @rm -v -f $(OBJ) $(BINS) *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/alarm.cpp b/mtce/src/alarm/alarm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/alarm.cpp rename to mtce/src/alarm/alarm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/alarm.h b/mtce/src/alarm/alarm.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/alarm.h rename to mtce/src/alarm/alarm.h diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/alarmData.cpp b/mtce/src/alarm/alarmData.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/alarmData.cpp rename to mtce/src/alarm/alarmData.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/alarmHdlr.cpp b/mtce/src/alarm/alarmHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/alarmHdlr.cpp rename to mtce/src/alarm/alarmHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/alarmInit.cpp b/mtce/src/alarm/alarmInit.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/alarmInit.cpp rename to mtce/src/alarm/alarmInit.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/alarmMgr.cpp b/mtce/src/alarm/alarmMgr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/alarmMgr.cpp rename to mtce/src/alarm/alarmMgr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/alarmUtil.cpp b/mtce/src/alarm/alarmUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/alarmUtil.cpp rename to mtce/src/alarm/alarmUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.init b/mtce/src/alarm/scripts/mtcalarm.init similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.init rename to mtce/src/alarm/scripts/mtcalarm.init diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.logrotate b/mtce/src/alarm/scripts/mtcalarm.logrotate similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.logrotate rename to mtce/src/alarm/scripts/mtcalarm.logrotate diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.pmon.conf b/mtce/src/alarm/scripts/mtcalarm.pmon.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.pmon.conf rename to mtce/src/alarm/scripts/mtcalarm.pmon.conf diff --git a/mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.service b/mtce/src/alarm/scripts/mtcalarm.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/alarm/scripts/mtcalarm.service rename to mtce/src/alarm/scripts/mtcalarm.service diff --git a/mtce/src/common/Makefile b/mtce/src/common/Makefile new file mode 100755 index 00000000..e0e5ddda --- /dev/null +++ b/mtce/src/common/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (c) 2018 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +SRCS = nodeClass.cpp +OBJS = $(SRCS:.cpp=.o) + + +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I../alarm -I../heartbeat -I../maintenance +CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11 + +STATIC_ANALYSIS_TOOL = cppcheck +STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] && echo 1 || echo 0) + +ifeq (,$(shell which ${CC})) +CC=g++ +endif + +.cpp.o: + $(CXX) $(CCFLAGS) $(INCLUDES) $(EXTRACCFLAGS) -c $< -o $@ + +static_analysis: +ifeq ($(STATIC_ANALYSIS_TOOL_EXISTS), 1) + $(STATIC_ANALYSIS_TOOL) --language=c++ --enable=warning -U__AREA__ -UWANT_FIT_TESTING *.cpp *.h +else + echo "Warning: '$(STATIC_ANALYSIS_TOOL)' static analysis tool not installed ; bypassing ..." +endif + +lib: clean $(OBJS) library + +build: static_analysis $(OBJS) library + +library: + ar rcs libmtcecommon.a $(COMMON_OBJS) $(EXTRAARFLAGS) + +clean: + @rm -v -f *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeClass.cpp b/mtce/src/common/nodeClass.cpp similarity index 99% rename from mtce-common/cgts-mtce-common-1.0/common/nodeClass.cpp rename to mtce/src/common/nodeClass.cpp index a629cf77..4b54be53 100755 --- a/mtce-common/cgts-mtce-common-1.0/common/nodeClass.cpp +++ b/mtce/src/common/nodeClass.cpp @@ -37,6 +37,21 @@ using namespace std; #include "alarm.h" #include "hbsAlarm.h" +/** Initialize the supplied command buffer */ +void mtcCmd_init ( mtcCmd & cmd ) +{ + cmd.cmd = 0 ; + cmd.rsp = 0 ; + cmd.ack = 0 ; + cmd.retry = 0 ; + cmd.parm1 = 0 ; + cmd.parm2 = 0 ; + cmd.task = false ; + cmd.status = RETRY ; + cmd.status_string.clear(); + cmd.name.clear(); +} + extern void mtcTimer_handler ( int sig, siginfo_t *si, void *uc); const char mtc_nodeAdminAction_str[MTC_ADMIN_ACTIONS][20] = diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeClass.h b/mtce/src/common/nodeClass.h similarity index 99% rename from mtce-common/cgts-mtce-common-1.0/common/nodeClass.h rename to mtce/src/common/nodeClass.h index c6bd1ed7..d009ea3c 100755 --- a/mtce-common/cgts-mtce-common-1.0/common/nodeClass.h +++ b/mtce/src/common/nodeClass.h @@ -2040,6 +2040,7 @@ nodeLinkClass * inv_init ( void ); nodeLinkClass * get_mtcInv_ptr ( void ); int module_init ( void ); +void mtcCmd_init ( mtcCmd & cmd ); const char * get_adminAction_str ( mtc_nodeAdminAction_enum action ); string bmc_get_ip ( string hostname, string mac , string & current_bm_ip ); void clear_host_degrade_causes ( unsigned int & degrade_mask ); diff --git a/mtce-common/cgts-mtce-common-1.0/common/nodeCmds.h b/mtce/src/common/nodeCmds.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/nodeCmds.h rename to mtce/src/common/nodeCmds.h diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/Makefile b/mtce/src/fsmon/Makefile similarity index 83% rename from mtce-common/cgts-mtce-common-1.0/fsmon/Makefile rename to mtce/src/fsmon/Makefile index 58445085..f21778d2 100644 --- a/mtce-common/cgts-mtce-common-1.0/fsmon/Makefile +++ b/mtce/src/fsmon/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2015 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -7,7 +7,7 @@ SRCS = fsmonInit.cpp fsmonHdlr.cpp OBJS = $(SRCS:.cpp=.o) LDLIBS = -lstdc++ -ldaemon -lcommon -lrt -lcrypto -INCLUDES = -I../daemon -I../common -I. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common CCFLAGS = -g -O2 -Wall -Wextra -Werror STATIC_ANALYSIS_TOOL = cppcheck @@ -35,8 +35,8 @@ daemon: ( cd ../daemon ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) clean_common: - @rm -f ../common/*.o - @rm -f ../daemon/*.o + @rm -v -f ../common/*.o + @rm -v -f ../daemon/*.o clean: clean_common - @rm -f $(OBJ) fsmond *.o *.a + @rm -v -f $(OBJ) fsmond *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/fsmon.h b/mtce/src/fsmon/fsmon.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/fsmon.h rename to mtce/src/fsmon/fsmon.h diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/fsmonHdlr.cpp b/mtce/src/fsmon/fsmonHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/fsmonHdlr.cpp rename to mtce/src/fsmon/fsmonHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/fsmonInit.cpp b/mtce/src/fsmon/fsmonInit.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/fsmonInit.cpp rename to mtce/src/fsmon/fsmonInit.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon b/mtce/src/fsmon/scripts/fsmon similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon rename to mtce/src/fsmon/scripts/fsmon diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon.conf b/mtce/src/fsmon/scripts/fsmon.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon.conf rename to mtce/src/fsmon/scripts/fsmon.conf diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon.logrotate b/mtce/src/fsmon/scripts/fsmon.logrotate similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon.logrotate rename to mtce/src/fsmon/scripts/fsmon.logrotate diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon.service b/mtce/src/fsmon/scripts/fsmon.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmon.service rename to mtce/src/fsmon/scripts/fsmon.service diff --git a/mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmond.conf b/mtce/src/fsmon/scripts/fsmond.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/fsmon/scripts/fsmond.conf rename to mtce/src/fsmon/scripts/fsmond.conf diff --git a/mtce/src/fsync/Makefile b/mtce/src/fsync/Makefile new file mode 100644 index 00000000..b041f158 --- /dev/null +++ b/mtce/src/fsync/Makefile @@ -0,0 +1,23 @@ +# +# Copyright (c) 2015-2018 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +SRCS = fsync.c +OBJS = $(SRCS:.c=.o) +LDLIBS = -L. +INCLUDES = -I. +CCFLAGS = -g -O2 -Wall -Wextra -Werror + +all: build + +.c.o: + $(CC) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) -c $< -o $@ + +build: $(OBJS) + $(CC) $(OBJS) $(LDLIBS) -o fsync + +clean: + @rm -v -f $(OBJS) fsync + diff --git a/mtce-common/cgts-mtce-common-1.0/common/fsync.c b/mtce/src/fsync/fsync.c similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/common/fsync.c rename to mtce/src/fsync/fsync.c diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/Makefile b/mtce/src/heartbeat/Makefile similarity index 53% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/Makefile rename to mtce/src/heartbeat/Makefile index d69bef0d..7c3d5f31 100755 --- a/mtce-common/cgts-mtce-common-1.0/heartbeat/Makefile +++ b/mtce/src/heartbeat/Makefile @@ -1,13 +1,16 @@ # -# Copyright (c) 2013-2015 Wind River Systems, Inc. +# Copyright (c) 2013-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # SRCS = hbsAlarm.cpp hbsClient.cpp hbsAgent.cpp hbsPmon.cpp hbsStubs.cpp OBJS = $(SRCS:.cpp=.o) + LDLIBS = -lstdc++ -ldaemon -lcommon -lthreadUtil -lpthread -lfmcommon -lalarm -lrt -lamon -lcrypto -luuid -INCLUDES = -I../daemon -I../common -I../alarm -I../maintenance -I../public -I. -I.. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I../common -I../alarm -I../maintenance -I../public + CCFLAGS = -g -O2 -Wall -Wextra -Werror STATIC_ANALYSIS_TOOL = cppcheck @@ -25,27 +28,24 @@ else echo "Warning: '$(STATIC_ANALYSIS_TOOL)' static analysis tool not installed ; bypassing ..." endif -all: static_analysis common daemon agent client +all: static_analysis common agent client -build: clean static_analysis $(OBJS) - $(CXX) $(CCFLAGS) hbsAlarm.o hbsAgent.o hbsStubs.o -L../daemon -L../common -L../public -L../alarm $(LDLIBS) -o hbsAgent - $(CXX) $(CCFLAGS) hbsClient.o hbsPmon.o -L../daemon -L../common -L../public -L../alarm $(LDLIBS) -o hbsClient +build: static_analysis $(OBJS) + $(CXX) $(CCFLAGS) hbsAlarm.o hbsAgent.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm $(LDLIBS) -o hbsAgent + $(CXX) $(CCFLAGS) hbsClient.o hbsPmon.o -L../public -L../alarm $(LDLIBS) -o hbsClient common: ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) -daemon: - ( cd ../daemon ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) - agent: $(OBJS) - $(CXX) $(CCFLAGS) hbsAgent.o -L../daemon -L../common -L../alarm -L../public $(LDLIBS) -o hbsAgent + $(CXX) $(CCFLAGS) hbsAgent.o -L../alarm -L../public $(LDLIBS) -o hbsAgent client: $(OBJS) - $(CXX) $(CCFLAGS) hbsClient.o -L../daemon -L../common -L../public $(LDLIBS) -o hbsClient + $(CXX) $(CCFLAGS) hbsClient.o -L../public $(LDLIBS) -o hbsClient clean_bins: - @rm -f $(BINS) + @rm -v -f $(BINS) clean: - @rm -f $(OBJ) $(BINS) *.o *.a + @rm -v -f $(OBJS) $(BINS) *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/hbsAgent.cpp b/mtce/src/heartbeat/hbsAgent.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/hbsAgent.cpp rename to mtce/src/heartbeat/hbsAgent.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/hbsAlarm.cpp b/mtce/src/heartbeat/hbsAlarm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/hbsAlarm.cpp rename to mtce/src/heartbeat/hbsAlarm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/hbsAlarm.h b/mtce/src/heartbeat/hbsAlarm.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/hbsAlarm.h rename to mtce/src/heartbeat/hbsAlarm.h diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/hbsBase.h b/mtce/src/heartbeat/hbsBase.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/hbsBase.h rename to mtce/src/heartbeat/hbsBase.h diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/hbsClient.cpp b/mtce/src/heartbeat/hbsClient.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/hbsClient.cpp rename to mtce/src/heartbeat/hbsClient.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/hbsPmon.cpp b/mtce/src/heartbeat/hbsPmon.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/hbsPmon.cpp rename to mtce/src/heartbeat/hbsPmon.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/heartbeat/hbsStubs.cpp b/mtce/src/heartbeat/hbsStubs.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/heartbeat/hbsStubs.cpp rename to mtce/src/heartbeat/hbsStubs.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/Makefile b/mtce/src/hostw/Makefile similarity index 83% rename from mtce-common/cgts-mtce-common-1.0/hostw/Makefile rename to mtce/src/hostw/Makefile index b0dfdaae..975f7924 100755 --- a/mtce-common/cgts-mtce-common-1.0/hostw/Makefile +++ b/mtce/src/hostw/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015-2016 Wind River Systems, Inc. +# Copyright (c) 2015-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -7,7 +7,7 @@ SRCS = hostwInit.cpp hostwHdlr.cpp hostwMsg.cpp OBJS = $(SRCS:.cpp=.o) LDLIBS = -lstdc++ -ldaemon -lcommon -lrt -lcrypto -INCLUDES = -I../daemon -I../common -I. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common CCFLAGS = -g -Wall -Wextra -Werror STATIC_ANALYSIS_TOOL = cppcheck @@ -35,9 +35,9 @@ daemon: ( cd ../daemon ; make clean ; make -j1 lib VER=$(VER) VER_MJR=$(VER_MJR)) clean_common: - @rm -f ../common/*.o - @rm -f ../daemon/*.o + @rm -v -f ../common/*.o + @rm -v -f ../daemon/*.o clean: clean_common - @rm -f $(OBJ) *.o *.a hostwd + @rm -v -f $(OBJ) *.o *.a hostwd diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/hostw.h b/mtce/src/hostw/hostw.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/hostw.h rename to mtce/src/hostw/hostw.h diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/hostwHdlr.cpp b/mtce/src/hostw/hostwHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/hostwHdlr.cpp rename to mtce/src/hostw/hostwHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/hostwInit.cpp b/mtce/src/hostw/hostwInit.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/hostwInit.cpp rename to mtce/src/hostw/hostwInit.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/hostwMsg.cpp b/mtce/src/hostw/hostwMsg.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/hostwMsg.cpp rename to mtce/src/hostw/hostwMsg.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/hostwMsg.h b/mtce/src/hostw/hostwMsg.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/hostwMsg.h rename to mtce/src/hostw/hostwMsg.h diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostw b/mtce/src/hostw/scripts/hostw similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostw rename to mtce/src/hostw/scripts/hostw diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostw.logrotate b/mtce/src/hostw/scripts/hostw.logrotate similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostw.logrotate rename to mtce/src/hostw/scripts/hostw.logrotate diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostw.service b/mtce/src/hostw/scripts/hostw.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostw.service rename to mtce/src/hostw/scripts/hostw.service diff --git a/mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostwd.conf b/mtce/src/hostw/scripts/hostwd.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hostw/scripts/hostwd.conf rename to mtce/src/hostw/scripts/hostwd.conf diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/Makefile b/mtce/src/hwmon/Makefile similarity index 87% rename from mtce-common/cgts-mtce-common-1.0/hwmon/Makefile rename to mtce/src/hwmon/Makefile index f24bcc52..aef39c60 100644 --- a/mtce-common/cgts-mtce-common-1.0/hwmon/Makefile +++ b/mtce/src/hwmon/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2016 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -22,7 +22,8 @@ SRCS += hwmonFsm.cpp OBJS = $(SRCS:.cpp=.o) BIN = hwmond LDLIBS = -lstdc++ -ldaemon -lfmcommon -lcommon -lthreadUtil -lipmiUtil -lpthread -levent -ljson-c -lrt -lcrypto -INCLUDES = -I../daemon -I../common -I../maintenance -I. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I../maintenance CCFLAGS = -g -O2 -Wall -Wextra -Werror -std=c++11 -pthread STATIC_ANALYSIS_TOOL = cppcheck @@ -51,7 +52,7 @@ daemon: ( cd ../daemon ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) clean_bins: - @rm -f $(BIN) + @rm -v -f $(BIN) clean: - @rm -f $(OBJS) $(BIN) + @rm -v -f $(OBJS) $(BIN) diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hp380.cpp b/mtce/src/hwmon/hp380.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hp380.cpp rename to mtce/src/hwmon/hp380.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmon.h b/mtce/src/hwmon/hwmon.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmon.h rename to mtce/src/hwmon/hwmon.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonAlarm.cpp b/mtce/src/hwmon/hwmonAlarm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonAlarm.cpp rename to mtce/src/hwmon/hwmonAlarm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonAlarm.h b/mtce/src/hwmon/hwmonAlarm.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonAlarm.h rename to mtce/src/hwmon/hwmonAlarm.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonClass.cpp b/mtce/src/hwmon/hwmonClass.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonClass.cpp rename to mtce/src/hwmon/hwmonClass.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonClass.h b/mtce/src/hwmon/hwmonClass.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonClass.h rename to mtce/src/hwmon/hwmonClass.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonFsm.cpp b/mtce/src/hwmon/hwmonFsm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonFsm.cpp rename to mtce/src/hwmon/hwmonFsm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonGroup.cpp b/mtce/src/hwmon/hwmonGroup.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonGroup.cpp rename to mtce/src/hwmon/hwmonGroup.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonGroup.h b/mtce/src/hwmon/hwmonGroup.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonGroup.h rename to mtce/src/hwmon/hwmonGroup.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHdlr.cpp b/mtce/src/hwmon/hwmonHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHdlr.cpp rename to mtce/src/hwmon/hwmonHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHttp.cpp b/mtce/src/hwmon/hwmonHttp.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHttp.cpp rename to mtce/src/hwmon/hwmonHttp.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHttp.h b/mtce/src/hwmon/hwmonHttp.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHttp.h rename to mtce/src/hwmon/hwmonHttp.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHttpClient.cpp b/mtce/src/hwmon/hwmonHttpClient.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonHttpClient.cpp rename to mtce/src/hwmon/hwmonHttpClient.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonInit.cpp b/mtce/src/hwmon/hwmonInit.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonInit.cpp rename to mtce/src/hwmon/hwmonInit.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonIpmi.cpp b/mtce/src/hwmon/hwmonIpmi.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonIpmi.cpp rename to mtce/src/hwmon/hwmonIpmi.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonIpmi.h b/mtce/src/hwmon/hwmonIpmi.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonIpmi.h rename to mtce/src/hwmon/hwmonIpmi.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonJson.cpp b/mtce/src/hwmon/hwmonJson.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonJson.cpp rename to mtce/src/hwmon/hwmonJson.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonJson.h b/mtce/src/hwmon/hwmonJson.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonJson.h rename to mtce/src/hwmon/hwmonJson.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonModel.cpp b/mtce/src/hwmon/hwmonModel.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonModel.cpp rename to mtce/src/hwmon/hwmonModel.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonModel.h b/mtce/src/hwmon/hwmonModel.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonModel.h rename to mtce/src/hwmon/hwmonModel.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonMsg.cpp b/mtce/src/hwmon/hwmonMsg.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonMsg.cpp rename to mtce/src/hwmon/hwmonMsg.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonParse.cpp b/mtce/src/hwmon/hwmonParse.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonParse.cpp rename to mtce/src/hwmon/hwmonParse.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonSensor.cpp b/mtce/src/hwmon/hwmonSensor.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonSensor.cpp rename to mtce/src/hwmon/hwmonSensor.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonSensor.h b/mtce/src/hwmon/hwmonSensor.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonSensor.h rename to mtce/src/hwmon/hwmonSensor.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonThreads.cpp b/mtce/src/hwmon/hwmonThreads.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonThreads.cpp rename to mtce/src/hwmon/hwmonThreads.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonThreads.h b/mtce/src/hwmon/hwmonThreads.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonThreads.h rename to mtce/src/hwmon/hwmonThreads.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonUtil.cpp b/mtce/src/hwmon/hwmonUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonUtil.cpp rename to mtce/src/hwmon/hwmonUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/hwmonUtil.h b/mtce/src/hwmon/hwmonUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/hwmonUtil.h rename to mtce/src/hwmon/hwmonUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmon.logrotate b/mtce/src/hwmon/scripts/hwmon.logrotate similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmon.logrotate rename to mtce/src/hwmon/scripts/hwmon.logrotate diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmon.service b/mtce/src/hwmon/scripts/hwmon.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmon.service rename to mtce/src/hwmon/scripts/hwmon.service diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmond.conf b/mtce/src/hwmon/scripts/hwmond.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmond.conf rename to mtce/src/hwmon/scripts/hwmond.conf diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmond_notify.py b/mtce/src/hwmon/scripts/hwmond_notify.py similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/hwmond_notify.py rename to mtce/src/hwmon/scripts/hwmond_notify.py diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/lsb/hwmon b/mtce/src/hwmon/scripts/lsb/hwmon similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/lsb/hwmon rename to mtce/src/hwmon/scripts/lsb/hwmon diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/ocf/hwmon b/mtce/src/hwmon/scripts/ocf/hwmon similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/ocf/hwmon rename to mtce/src/hwmon/scripts/ocf/hwmon diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/show_hp360 b/mtce/src/hwmon/scripts/show_hp360 similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/show_hp360 rename to mtce/src/hwmon/scripts/show_hp360 diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/show_hp380 b/mtce/src/hwmon/scripts/show_hp380 similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/show_hp380 rename to mtce/src/hwmon/scripts/show_hp380 diff --git a/mtce-common/cgts-mtce-common-1.0/hwmon/scripts/show_quanta b/mtce/src/hwmon/scripts/show_quanta similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/hwmon/scripts/show_quanta rename to mtce/src/hwmon/scripts/show_quanta diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/Makefile b/mtce/src/maintenance/Makefile similarity index 70% rename from mtce-common/cgts-mtce-common-1.0/maintenance/Makefile rename to mtce/src/maintenance/Makefile index 5e05a5fe..f49ec335 100755 --- a/mtce-common/cgts-mtce-common-1.0/maintenance/Makefile +++ b/mtce/src/maintenance/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2016 Wind River Systems, Inc. +# Copyright (c) 2013-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -26,6 +26,7 @@ SRCS += mtcVimApi.cpp COMPUTE_OBJS = mtcNodeComp.o COMPUTE_OBJS += mtcCompMsg.o +CONTROL_OBJS += ../common/nodeClass.o CONTROL_OBJS = mtcAlarm.o CONTROL_OBJS += mtcThreads.o @@ -44,11 +45,13 @@ CONTROL_OBJS += mtcHttpSvr.o CONTROL_OBJS += mtcCmdHdlr.o CONTROL_OBJS += mtcNodeMnfa.o CONTROL_OBJS += mtcVimApi.o +CONTROL_OBJS += ../common/nodeClass.o OBJS = $(SRCS:.cpp=.o) BINS = mtcAgent mtcClient LDLIBS += -lstdc++ -ldaemon -lcommon -lthreadUtil -lipmiUtil -lfmcommon -lrmonapi -lalarm -lpthread -lrt -levent -ljson-c -lamon -lcrypto -luuid -INCLUDES += -I../common -I../daemon -I../alarm -I../heartbeat -I../hwmon -I../public -I../rmon/rmonApi -I. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I../common -I../alarm -I../heartbeat -I../hwmon -I../public -I../rmon/rmonApi CCFLAGS += -g -O2 -Wall -Wextra -Werror -Wno-missing-braces STATIC_ANALYSIS_TOOL = cppcheck @@ -57,7 +60,7 @@ STATIC_ANALYSIS_TOOL_EXISTS = $(shell [[ -e `which $(STATIC_ANALYSIS_TOOL)` ]] & .cpp.o: $(CXX) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) -c $< -o $@ -all: remove_bins $(OBJS) $(BINS) +all: common remove_bins $(OBJS) $(BINS) static_analysis: ifeq ($(STATIC_ANALYSIS_TOOL_EXISTS), 1) @@ -66,16 +69,22 @@ else echo "Warning: '$(STATIC_ANALYSIS_TOOL)' static analysis tool not installed ; bypassing ..." endif -build: clean static_analysis remove_bins $(OBJS) $(BINS) +build: static_analysis remove_bins $(OBJS) $(BINS) + +common: + ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) mtcAgent: $(OBJS) - $(CXX) $(CONTROL_OBJS) -L../daemon -L../common -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) -o mtcAgent + $(CXX) $(CONTROL_OBJS) -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) -o mtcAgent mtcClient: $(OBJS) - $(CXX) $(COMPUTE_OBJS) -L../daemon -L../common -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) -o mtcClient + $(CXX) $(COMPUTE_OBJS) -L../public -L../alarm -L../rmon/rmonApi $(LDLIBS) -o mtcClient remove_bins: - @rm -f $(BINS) + @rm -v -f $(BINS) -clean: - @rm -f $(OBJS) $(BINS) +clean_common: + @rm -v -f ../common/*.o ../common/*.a + +clean: clean_common + @rm -v -f $(OBJS) $(BINS) diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/ipmiClient.h b/mtce/src/maintenance/ipmiClient.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/ipmiClient.h rename to mtce/src/maintenance/ipmiClient.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcAlarm.cpp b/mtce/src/maintenance/mtcAlarm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcAlarm.cpp rename to mtce/src/maintenance/mtcAlarm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcAlarm.h b/mtce/src/maintenance/mtcAlarm.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcAlarm.h rename to mtce/src/maintenance/mtcAlarm.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcBrdMgmt.cpp b/mtce/src/maintenance/mtcBrdMgmt.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcBrdMgmt.cpp rename to mtce/src/maintenance/mtcBrdMgmt.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcBrdMgmt.h b/mtce/src/maintenance/mtcBrdMgmt.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcBrdMgmt.h rename to mtce/src/maintenance/mtcBrdMgmt.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcCmdHdlr.cpp b/mtce/src/maintenance/mtcCmdHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcCmdHdlr.cpp rename to mtce/src/maintenance/mtcCmdHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcCompMsg.cpp b/mtce/src/maintenance/mtcCompMsg.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcCompMsg.cpp rename to mtce/src/maintenance/mtcCompMsg.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcCtrlMsg.cpp b/mtce/src/maintenance/mtcCtrlMsg.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcCtrlMsg.cpp rename to mtce/src/maintenance/mtcCtrlMsg.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpSvr.cpp b/mtce/src/maintenance/mtcHttpSvr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpSvr.cpp rename to mtce/src/maintenance/mtcHttpSvr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpSvr.h b/mtce/src/maintenance/mtcHttpSvr.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpSvr.h rename to mtce/src/maintenance/mtcHttpSvr.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpUtil.cpp b/mtce/src/maintenance/mtcHttpUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpUtil.cpp rename to mtce/src/maintenance/mtcHttpUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpUtil.h b/mtce/src/maintenance/mtcHttpUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcHttpUtil.h rename to mtce/src/maintenance/mtcHttpUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcInvApi.cpp b/mtce/src/maintenance/mtcInvApi.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcInvApi.cpp rename to mtce/src/maintenance/mtcInvApi.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcInvApi.h b/mtce/src/maintenance/mtcInvApi.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcInvApi.h rename to mtce/src/maintenance/mtcInvApi.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcIpmiUtil.cpp b/mtce/src/maintenance/mtcIpmiUtil.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcIpmiUtil.cpp rename to mtce/src/maintenance/mtcIpmiUtil.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcIpmiUtil.h b/mtce/src/maintenance/mtcIpmiUtil.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcIpmiUtil.h rename to mtce/src/maintenance/mtcIpmiUtil.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcKeyApi.cpp b/mtce/src/maintenance/mtcKeyApi.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcKeyApi.cpp rename to mtce/src/maintenance/mtcKeyApi.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcKeyApi.h b/mtce/src/maintenance/mtcKeyApi.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcKeyApi.h rename to mtce/src/maintenance/mtcKeyApi.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeComp.cpp b/mtce/src/maintenance/mtcNodeComp.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeComp.cpp rename to mtce/src/maintenance/mtcNodeComp.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeComp.h b/mtce/src/maintenance/mtcNodeComp.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeComp.h rename to mtce/src/maintenance/mtcNodeComp.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeCtrl.cpp b/mtce/src/maintenance/mtcNodeCtrl.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeCtrl.cpp rename to mtce/src/maintenance/mtcNodeCtrl.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeFsm.cpp b/mtce/src/maintenance/mtcNodeFsm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeFsm.cpp rename to mtce/src/maintenance/mtcNodeFsm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeFsm.h b/mtce/src/maintenance/mtcNodeFsm.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeFsm.h rename to mtce/src/maintenance/mtcNodeFsm.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.cpp b/mtce/src/maintenance/mtcNodeHdlrs.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.cpp rename to mtce/src/maintenance/mtcNodeHdlrs.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.h b/mtce/src/maintenance/mtcNodeHdlrs.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.h rename to mtce/src/maintenance/mtcNodeHdlrs.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeMnfa.cpp b/mtce/src/maintenance/mtcNodeMnfa.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeMnfa.cpp rename to mtce/src/maintenance/mtcNodeMnfa.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeMsg.h b/mtce/src/maintenance/mtcNodeMsg.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeMsg.h rename to mtce/src/maintenance/mtcNodeMsg.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcSmgrApi.cpp b/mtce/src/maintenance/mtcSmgrApi.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcSmgrApi.cpp rename to mtce/src/maintenance/mtcSmgrApi.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcSmgrApi.h b/mtce/src/maintenance/mtcSmgrApi.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcSmgrApi.h rename to mtce/src/maintenance/mtcSmgrApi.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcSubfHdlrs.cpp b/mtce/src/maintenance/mtcSubfHdlrs.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcSubfHdlrs.cpp rename to mtce/src/maintenance/mtcSubfHdlrs.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcThreads.cpp b/mtce/src/maintenance/mtcThreads.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcThreads.cpp rename to mtce/src/maintenance/mtcThreads.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcThreads.h b/mtce/src/maintenance/mtcThreads.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcThreads.h rename to mtce/src/maintenance/mtcThreads.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcVimApi.cpp b/mtce/src/maintenance/mtcVimApi.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcVimApi.cpp rename to mtce/src/maintenance/mtcVimApi.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcVimApi.h b/mtce/src/maintenance/mtcVimApi.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcVimApi.h rename to mtce/src/maintenance/mtcVimApi.h diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcWorkQueue.cpp b/mtce/src/maintenance/mtcWorkQueue.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/maintenance/mtcWorkQueue.cpp rename to mtce/src/maintenance/mtcWorkQueue.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/mtclog/Makefile b/mtce/src/mtclog/Makefile similarity index 81% rename from mtce-common/cgts-mtce-common-1.0/mtclog/Makefile rename to mtce/src/mtclog/Makefile index 0ad09ef2..343c1936 100644 --- a/mtce-common/cgts-mtce-common-1.0/mtclog/Makefile +++ b/mtce/src/mtclog/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Wind River Systems, Inc. +# Copyright (c) 2015-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -7,7 +7,8 @@ SRCS = mtclog.cpp OBJS = $(SRCS:.cpp=.o) LDLIBS = -lstdc++ -ldaemon -lcommon -lrt -lcrypto -INCLUDES = -I../daemon -I../common -I../maintenance -I. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I../maintenance CCFLAGS = -g -O2 -Wall -Wextra -Werror STATIC_ANALYSIS_TOOL = cppcheck @@ -36,8 +37,8 @@ daemon: ( cd ../daemon ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) clean_common: - @rm -f ../common/*.o - @rm -f ../daemon/*.o + @rm -v -f ../common/*.o + @rm -v -f ../daemon/*.o clean: clean_common - @rm -f $(OBJ) mtclogd *.o *.a + @rm -v -f $(OBJ) mtclogd *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/mtclog/mtclog.cpp b/mtce/src/mtclog/mtclog.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/mtclog/mtclog.cpp rename to mtce/src/mtclog/mtclog.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/Makefile b/mtce/src/pmon/Makefile similarity index 82% rename from mtce-common/cgts-mtce-common-1.0/pmon/Makefile rename to mtce/src/pmon/Makefile index 2453621b..280144ec 100755 --- a/mtce-common/cgts-mtce-common-1.0/pmon/Makefile +++ b/mtce/src/pmon/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2016 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -7,7 +7,8 @@ SRCS = pmonAlarm.cpp pmonInit.cpp pmonMsg.cpp pmonHdlr.cpp pmonFsm.cpp OBJS = $(SRCS:.cpp=.o) LDLIBS = -lstdc++ -ldaemon -lcommon -lrt -lcrypto -lfmcommon -ljson-c -INCLUDES = -I../daemon -I../common -I../hostw -I. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I../hostw CCFLAGS = -g -O2 -Wall -Wextra -Werror STATIC_ANALYSIS_TOOL = cppcheck @@ -35,8 +36,8 @@ daemon: ( cd ../daemon ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) clean_common: - @rm -f ../common/*.o - @rm -f ../daemon/*.o + @rm -v -f ../common/*.o + @rm -v -f ../daemon/*.o clean: clean_common - @rm -f $(OBJ) pmond *.o *.a + @rm -v -f $(OBJ) pmond *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/pmon.h b/mtce/src/pmon/pmon.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/pmon.h rename to mtce/src/pmon/pmon.h diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/pmonAlarm.cpp b/mtce/src/pmon/pmonAlarm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/pmonAlarm.cpp rename to mtce/src/pmon/pmonAlarm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/pmonAlarm.h b/mtce/src/pmon/pmonAlarm.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/pmonAlarm.h rename to mtce/src/pmon/pmonAlarm.h diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/pmonFsm.cpp b/mtce/src/pmon/pmonFsm.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/pmonFsm.cpp rename to mtce/src/pmon/pmonFsm.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/pmonHdlr.cpp b/mtce/src/pmon/pmonHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/pmonHdlr.cpp rename to mtce/src/pmon/pmonHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/pmonInit.cpp b/mtce/src/pmon/pmonInit.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/pmonInit.cpp rename to mtce/src/pmon/pmonInit.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/pmonMsg.cpp b/mtce/src/pmon/pmonMsg.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/pmonMsg.cpp rename to mtce/src/pmon/pmonMsg.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/acpid.conf b/mtce/src/pmon/scripts/acpid.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/acpid.conf rename to mtce/src/pmon/scripts/acpid.conf diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/nslcd.conf b/mtce/src/pmon/scripts/nslcd.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/nslcd.conf rename to mtce/src/pmon/scripts/nslcd.conf diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon b/mtce/src/pmon/scripts/pmon similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon rename to mtce/src/pmon/scripts/pmon diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-restart b/mtce/src/pmon/scripts/pmon-restart similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-restart rename to mtce/src/pmon/scripts/pmon-restart diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-start b/mtce/src/pmon/scripts/pmon-start similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-start rename to mtce/src/pmon/scripts/pmon-start diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-stop b/mtce/src/pmon/scripts/pmon-stop similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-stop rename to mtce/src/pmon/scripts/pmon-stop diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-test.sh b/mtce/src/pmon/scripts/pmon-test.sh similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon-test.sh rename to mtce/src/pmon/scripts/pmon-test.sh diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon.logrotate b/mtce/src/pmon/scripts/pmon.logrotate similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon.logrotate rename to mtce/src/pmon/scripts/pmon.logrotate diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon.service b/mtce/src/pmon/scripts/pmon.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmon.service rename to mtce/src/pmon/scripts/pmon.service diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmond.conf b/mtce/src/pmon/scripts/pmond.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/pmond.conf rename to mtce/src/pmon/scripts/pmond.conf diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/sshd.conf b/mtce/src/pmon/scripts/sshd.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/sshd.conf rename to mtce/src/pmon/scripts/sshd.conf diff --git a/mtce-common/cgts-mtce-common-1.0/pmon/scripts/syslog-ng.conf b/mtce/src/pmon/scripts/syslog-ng.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/pmon/scripts/syslog-ng.conf rename to mtce/src/pmon/scripts/syslog-ng.conf diff --git a/mtce-common/cgts-mtce-common-1.0/public/Makefile b/mtce/src/public/Makefile similarity index 89% rename from mtce-common/cgts-mtce-common-1.0/public/Makefile rename to mtce/src/public/Makefile index 2e020030..5e23bc4d 100644 --- a/mtce-common/cgts-mtce-common-1.0/public/Makefile +++ b/mtce/src/public/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2015 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -45,7 +45,7 @@ $(SRCS:.c=.d):%.d:%.c include $(SRCS:.c=.d) clean: - rm -f *.o - rm -f *.so - rm -f *.so.* - rm -f *.d + @rm -v -f *.o + @rm -v -f *.so + @rm -v -f *.so.* + @rm -v -f *.d diff --git a/mtce-common/cgts-mtce-common-1.0/public/amon.c b/mtce/src/public/amon.c similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/public/amon.c rename to mtce/src/public/amon.c diff --git a/mtce-common/cgts-mtce-common-1.0/public/amon.h b/mtce/src/public/amon.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/public/amon.h rename to mtce/src/public/amon.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/Makefile b/mtce/src/rmon/Makefile similarity index 86% rename from mtce-common/cgts-mtce-common-1.0/rmon/Makefile rename to mtce/src/rmon/Makefile index fb46a7ba..eb749159 100755 --- a/mtce-common/cgts-mtce-common-1.0/rmon/Makefile +++ b/mtce/src/rmon/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2017 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -7,7 +7,8 @@ SRCS = rmonInit.cpp rmonMsg.cpp rmonHdlr.cpp rmonHttp.cpp interfaceHdlr.cpp rmonFM.cpp remoteloggingHdlr.cpp thinmetaHdlr.cpp OBJS = $(SRCS:.cpp=.o) LDLIBS = -lstdc++ -ldaemon -lcommon -lfmcommon -lrmonapi -lrt -levent -lcrypto -luuid -lpthread -ljson-c -INCLUDES = -I../daemon -I../common -IrmonApi/ -I. -I.. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -IrmonApi CCFLAGS = -g -O2 -Wall -Werror -Wextra STATIC_ANALYSIS_TOOL = cppcheck @@ -37,4 +38,4 @@ daemon: ( cd ../daemon ; make lib VER=$(VER) VER_MJR=$(VER_MJR)) clean: - @rm -f $(OBJ) rmond *.o *.a + @rm -v -f $(OBJ) rmond *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/interfaceHdlr.cpp b/mtce/src/rmon/interfaceHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/interfaceHdlr.cpp rename to mtce/src/rmon/interfaceHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/remoteloggingHdlr.cpp b/mtce/src/rmon/remoteloggingHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/remoteloggingHdlr.cpp rename to mtce/src/rmon/remoteloggingHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmon.h b/mtce/src/rmon/rmon.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmon.h rename to mtce/src/rmon/rmon.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi.h b/mtce/src/rmon/rmonApi.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi.h rename to mtce/src/rmon/rmonApi.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/Makefile b/mtce/src/rmon/rmonApi/Makefile similarity index 89% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/Makefile rename to mtce/src/rmon/rmonApi/Makefile index 08ee7b38..486d3634 100644 --- a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/Makefile +++ b/mtce/src/rmon/rmonApi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2015 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -45,7 +45,7 @@ $(SRCS:.c=.d):%.d:%.c include $(SRCS:.c=.d) clean: - rm -f *.o - rm -f *.so - rm -f *.so.* - rm -f *.d + @rm -v -f *.o + @rm -v -f *.so + @rm -v -f *.so.* + @rm -v -f *.d diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/rmon_api.c b/mtce/src/rmon/rmonApi/rmon_api.c similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/rmon_api.c rename to mtce/src/rmon/rmonApi/rmon_api.c diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/rmon_api.h b/mtce/src/rmon/rmonApi/rmon_api.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/rmon_api.h rename to mtce/src/rmon/rmonApi/rmon_api.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/rmon_nodeMacro.h b/mtce/src/rmon/rmonApi/rmon_nodeMacro.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/rmon_nodeMacro.h rename to mtce/src/rmon/rmonApi/rmon_nodeMacro.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/Makefile b/mtce/src/rmon/rmonApi/tests/Makefile similarity index 80% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/Makefile rename to mtce/src/rmon/rmonApi/tests/Makefile index 66091098..fdfea4b4 100644 --- a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/Makefile +++ b/mtce/src/rmon/rmonApi/tests/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -19,4 +19,4 @@ build: $(OBJS) $(CXX) $(CCFLAGS) $(OBJS) -L../ -L/usr/lib64/ $(LDLIBS) -o rmond_api_test clean: - @rm -f $(OBJ) rmond_api_test *.o *.a + @rm -v -f $(OBJ) rmond_api_test *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/rmon_api_client_test.cpp b/mtce/src/rmon/rmonApi/tests/rmon_api_client_test.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/rmon_api_client_test.cpp rename to mtce/src/rmon/rmonApi/tests/rmon_api_client_test.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/rmon_api_client_test.h b/mtce/src/rmon/rmonApi/tests/rmon_api_client_test.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/rmon_api_client_test.h rename to mtce/src/rmon/rmonApi/tests/rmon_api_client_test.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/rmond_api_test b/mtce/src/rmon/rmonApi/tests/rmond_api_test similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonApi/tests/rmond_api_test rename to mtce/src/rmon/rmonApi/tests/rmond_api_test diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonFM.cpp b/mtce/src/rmon/rmonFM.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonFM.cpp rename to mtce/src/rmon/rmonFM.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonHdlr.cpp b/mtce/src/rmon/rmonHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonHdlr.cpp rename to mtce/src/rmon/rmonHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonHttp.cpp b/mtce/src/rmon/rmonHttp.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonHttp.cpp rename to mtce/src/rmon/rmonHttp.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonHttp.h b/mtce/src/rmon/rmonHttp.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonHttp.h rename to mtce/src/rmon/rmonHttp.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonInit.cpp b/mtce/src/rmon/rmonInit.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonInit.cpp rename to mtce/src/rmon/rmonInit.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmonMsg.cpp b/mtce/src/rmon/rmonMsg.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmonMsg.cpp rename to mtce/src/rmon/rmonMsg.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmon_resource_notify/Makefile b/mtce/src/rmon/rmon_resource_notify/Makefile similarity index 81% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmon_resource_notify/Makefile rename to mtce/src/rmon/rmon_resource_notify/Makefile index 3aa3451b..011ccedd 100644 --- a/mtce-common/cgts-mtce-common-1.0/rmon/rmon_resource_notify/Makefile +++ b/mtce/src/rmon/rmon_resource_notify/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2014-2015 Wind River Systems, Inc. +# Copyright (c) 2014-2018 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -7,7 +7,8 @@ SRCS = rmon_resource_notify.cpp OBJS = $(SRCS:.cpp=.o) LDLIBS = -lstdc++ -lrmonapi -lrt -INCLUDES = -I../../common -I../../daemon -I../ -I. +INCLUDES = -I. -I/usr/include/mtce-daemon -I/usr/include/mtce-common +INCLUDES += -I.. CCFLAGS = -g -O2 -Wall -Wextra -Werror STATIC_ANALYSIS_TOOL = cppcheck @@ -29,4 +30,4 @@ build: clean static_analysis $(OBJS) $(CXX) $(CCFLAGS) $(OBJS) -L../../common -L../../daemon -L../rmonApi/ $(LDLIBS) -o rmon_resource_notify clean: - @rm -f $(OBJ) rmon_resource_notify *.o *.a + @rm -v -f $(OBJ) rmon_resource_notify *.o *.a diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmon_resource_notify/rmon_resource_notify.cpp b/mtce/src/rmon/rmon_resource_notify/rmon_resource_notify.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmon_resource_notify/rmon_resource_notify.cpp rename to mtce/src/rmon/rmon_resource_notify/rmon_resource_notify.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/rmon_resource_notify/rmon_resource_notify.h b/mtce/src/rmon/rmon_resource_notify/rmon_resource_notify.h similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/rmon_resource_notify/rmon_resource_notify.h rename to mtce/src/rmon/rmon_resource_notify/rmon_resource_notify.h diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/cinder_virtual_resource.conf b/mtce/src/rmon/scripts/cinder_virtual_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/cinder_virtual_resource.conf rename to mtce/src/rmon/scripts/cinder_virtual_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/infrastructure_resource.conf b/mtce/src/rmon/scripts/infrastructure_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/infrastructure_resource.conf rename to mtce/src/rmon/scripts/infrastructure_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/instance_resource.conf b/mtce/src/rmon/scripts/instance_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/instance_resource.conf rename to mtce/src/rmon/scripts/instance_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/management_resource.conf b/mtce/src/rmon/scripts/management_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/management_resource.conf rename to mtce/src/rmon/scripts/management_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/nova_virtual_resource.conf b/mtce/src/rmon/scripts/nova_virtual_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/nova_virtual_resource.conf rename to mtce/src/rmon/scripts/nova_virtual_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/oam_resource.conf b/mtce/src/rmon/scripts/oam_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/oam_resource.conf rename to mtce/src/rmon/scripts/oam_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/query_ntp_servers.sh b/mtce/src/rmon/scripts/query_ntp_servers.sh similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/query_ntp_servers.sh rename to mtce/src/rmon/scripts/query_ntp_servers.sh diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/remotelogging_resource.conf b/mtce/src/rmon/scripts/remotelogging_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/remotelogging_resource.conf rename to mtce/src/rmon/scripts/remotelogging_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon b/mtce/src/rmon/scripts/rmon similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon rename to mtce/src/rmon/scripts/rmon diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon.conf b/mtce/src/rmon/scripts/rmon.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon.conf rename to mtce/src/rmon/scripts/rmon.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon.logrotate b/mtce/src/rmon/scripts/rmon.logrotate similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon.logrotate rename to mtce/src/rmon/scripts/rmon.logrotate diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon.service b/mtce/src/rmon/scripts/rmon.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon.service rename to mtce/src/rmon/scripts/rmon.service diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon_reload_on_cpe.sh b/mtce/src/rmon/scripts/rmon_reload_on_cpe.sh similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmon_reload_on_cpe.sh rename to mtce/src/rmon/scripts/rmon_reload_on_cpe.sh diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmond.conf b/mtce/src/rmon/scripts/rmond.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/rmond.conf rename to mtce/src/rmon/scripts/rmond.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/scripts/virtual_resource.conf b/mtce/src/rmon/scripts/virtual_resource.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/scripts/virtual_resource.conf rename to mtce/src/rmon/scripts/virtual_resource.conf diff --git a/mtce-common/cgts-mtce-common-1.0/rmon/thinmetaHdlr.cpp b/mtce/src/rmon/thinmetaHdlr.cpp similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/rmon/thinmetaHdlr.cpp rename to mtce/src/rmon/thinmetaHdlr.cpp diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/config b/mtce/src/scripts/config similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/config rename to mtce/src/scripts/config diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/config.service b/mtce/src/scripts/config.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/config.service rename to mtce/src/scripts/config.service diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/dmemchk.sh b/mtce/src/scripts/dmemchk.sh similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/dmemchk.sh rename to mtce/src/scripts/dmemchk.sh diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/goenabled b/mtce/src/scripts/goenabled similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/goenabled rename to mtce/src/scripts/goenabled diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/goenabled.service b/mtce/src/scripts/goenabled.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/goenabled.service rename to mtce/src/scripts/goenabled.service diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/hbsAgent b/mtce/src/scripts/hbsAgent similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/hbsAgent rename to mtce/src/scripts/hbsAgent diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/hbsClient b/mtce/src/scripts/hbsClient similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/hbsClient rename to mtce/src/scripts/hbsClient diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/hbsClient.conf b/mtce/src/scripts/hbsClient.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/hbsClient.conf rename to mtce/src/scripts/hbsClient.conf diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/hbsClient.service b/mtce/src/scripts/hbsClient.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/hbsClient.service rename to mtce/src/scripts/hbsClient.service diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/hwclock.service b/mtce/src/scripts/hwclock.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/hwclock.service rename to mtce/src/scripts/hwclock.service diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/hwclock.sh b/mtce/src/scripts/hwclock.sh similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/hwclock.sh rename to mtce/src/scripts/hwclock.sh diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mgmtlinkup b/mtce/src/scripts/mgmtlinkup similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mgmtlinkup rename to mtce/src/scripts/mgmtlinkup diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtc.conf b/mtce/src/scripts/mtc.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtc.conf rename to mtce/src/scripts/mtc.conf diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtc.ini b/mtce/src/scripts/mtc.ini similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtc.ini rename to mtce/src/scripts/mtc.ini diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtcAgent b/mtce/src/scripts/mtcAgent similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtcAgent rename to mtce/src/scripts/mtcAgent diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtcClient b/mtce/src/scripts/mtcClient similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtcClient rename to mtce/src/scripts/mtcClient diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtcClient.conf b/mtce/src/scripts/mtcClient.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtcClient.conf rename to mtce/src/scripts/mtcClient.conf diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtcClient.service b/mtce/src/scripts/mtcClient.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtcClient.service rename to mtce/src/scripts/mtcClient.service diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtcTest b/mtce/src/scripts/mtcTest similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtcTest rename to mtce/src/scripts/mtcTest diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtce.logrotate b/mtce/src/scripts/mtce.logrotate similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtce.logrotate rename to mtce/src/scripts/mtce.logrotate diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtcinit b/mtce/src/scripts/mtcinit similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtcinit rename to mtce/src/scripts/mtcinit diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtclog b/mtce/src/scripts/mtclog similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtclog rename to mtce/src/scripts/mtclog diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtclog.service b/mtce/src/scripts/mtclog.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtclog.service rename to mtce/src/scripts/mtclog.service diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/mtclogd.conf b/mtce/src/scripts/mtclogd.conf similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/mtclogd.conf rename to mtce/src/scripts/mtclogd.conf diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/runservices b/mtce/src/scripts/runservices similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/runservices rename to mtce/src/scripts/runservices diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/runservices.service b/mtce/src/scripts/runservices.service similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/runservices.service rename to mtce/src/scripts/runservices.service diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/sched_trace b/mtce/src/scripts/sched_trace similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/sched_trace rename to mtce/src/scripts/sched_trace diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/sensor_hp360_v1_ilo_v4.profile b/mtce/src/scripts/sensor_hp360_v1_ilo_v4.profile similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/sensor_hp360_v1_ilo_v4.profile rename to mtce/src/scripts/sensor_hp360_v1_ilo_v4.profile diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/sensor_hp380_v1_ilo_v4.profile b/mtce/src/scripts/sensor_hp380_v1_ilo_v4.profile similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/sensor_hp380_v1_ilo_v4.profile rename to mtce/src/scripts/sensor_hp380_v1_ilo_v4.profile diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/sensor_integration_profile.README b/mtce/src/scripts/sensor_integration_profile.README similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/sensor_integration_profile.README rename to mtce/src/scripts/sensor_integration_profile.README diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/sensor_quanta_v1_ilo_v4.profile b/mtce/src/scripts/sensor_quanta_v1_ilo_v4.profile similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/sensor_quanta_v1_ilo_v4.profile rename to mtce/src/scripts/sensor_quanta_v1_ilo_v4.profile diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/store_trace b/mtce/src/scripts/store_trace similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/store_trace rename to mtce/src/scripts/store_trace diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/stress_ras.sh b/mtce/src/scripts/stress_ras.sh similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/stress_ras.sh rename to mtce/src/scripts/stress_ras.sh diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/stress_swact.sh b/mtce/src/scripts/stress_swact.sh similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/stress_swact.sh rename to mtce/src/scripts/stress_swact.sh diff --git a/mtce-common/cgts-mtce-common-1.0/scripts/wipedisk b/mtce/src/scripts/wipedisk similarity index 100% rename from mtce-common/cgts-mtce-common-1.0/scripts/wipedisk rename to mtce/src/scripts/wipedisk