Add Debian packaging for mtce packages

Some of the code used TRUE instead of true which did not compile
for Debian. These instances were changed to true.
Some #define constants generated narrowing errors because their
values are negative in a 32 bit integer. These values were
explicitly casted to int in the case statements causing the errors.

Story: 2009101
Task: 43426

Signed-off-by: Tracey Bogue <tracey.bogue@windriver.com>
Change-Id: Iffc4305660779010969e0c506d4ef46e1ebc2c71
This commit is contained in:
Tracey Bogue 2021-09-23 13:39:46 -05:00
parent 366b68d3c7
commit 0551c665cb
50 changed files with 847 additions and 30 deletions

5
debian_pkg_dirs Normal file
View File

@ -0,0 +1,5 @@
mtce
mtce-common
mtce-compute
mtce-control
mtce-storage

View File

@ -0,0 +1,5 @@
mtce-common (1.0-1) unstable; urgency=medium
* Initial release.
-- Tracey Bogue <tracey.bogue@windriver.com> Thu, 16 Sep 2021 18:24:12 +0000

View File

@ -0,0 +1,24 @@
Source: mtce-common
Section: admin
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13),
expect,
fm-common-dev,
fm-mgr,
libevent-dev,
libjson-c-dev,
libssl-dev,
libsystemd-dev,
postgresql,
uuid-dev,
cppcheck
Standards-Version: 4.5.1
Homepage: https://www.starlingx.io
Package: mtce-common-dev
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: StarlingX Maintenance Common Base Package
The StarlingX Maintenance Common Base package contains header files, and
related items necessary for software development.

View File

@ -0,0 +1,41 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mtce-common
Source: https://opendev.org/starlingx/metal
Files: *
Copyright: (c) 2013-2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.

View File

@ -0,0 +1,2 @@
usr/include/*

View File

@ -0,0 +1,54 @@
#!/usr/bin/make -f
# export DH_VERBOSE = 1
PACKAGE = $(shell dh_listpackages)
INCLUDE_DIR = debian/$(PACKAGE)/usr/include
MTCE_COMMON_INCLUDE = $(INCLUDE_DIR)/mtce-common
MTCE_DAEMON_INCLUDE = $(INCLUDE_DIR)/mtce-daemon
LIB_DIR = debian/$(PACKAGE)/usr/lib
%:
dh $@
override_dh_auto_install:
install -m 755 -d ${LIB_DIR}
install -m 644 -p -D daemon/libdaemon.a ${LIB_DIR}
install -m 644 -p -D common/libcommon.a ${LIB_DIR}
install -m 644 -p -D common/libthreadUtil.a ${LIB_DIR}
install -m 644 -p -D common/libbmcUtils.a ${LIB_DIR}
install -m 644 -p -D common/libpingUtil.a ${LIB_DIR}
install -m 644 -p -D common/libnodeBase.a ${LIB_DIR}
install -m 644 -p -D common/libregexUtil.a ${LIB_DIR}
install -m 644 -p -D common/libhostUtil.a ${LIB_DIR}
install -m 755 -d ${INCLUDE_DIR}
install -m 755 -d ${MTCE_COMMON_INCLUDE}
install -m 644 -p -D common/alarmUtil.h ${MTCE_COMMON_INCLUDE}/alarmUtil.h
install -m 644 -p -D common/bmcUtil.h ${MTCE_COMMON_INCLUDE}/bmcUtil.h
install -m 644 -p -D common/fitCodes.h ${MTCE_COMMON_INCLUDE}/fitCodes.h
install -m 644 -p -D common/hostClass.h ${MTCE_COMMON_INCLUDE}/hostClass.h
install -m 644 -p -D common/hostUtil.h ${MTCE_COMMON_INCLUDE}/hostUtil.h
install -m 644 -p -D common/httpUtil.h ${MTCE_COMMON_INCLUDE}/httpUtil.h
install -m 644 -p -D common/ipmiUtil.h ${MTCE_COMMON_INCLUDE}/ipmiUtil.h
install -m 644 -p -D common/jsonUtil.h ${MTCE_COMMON_INCLUDE}/jsonUtil.h
install -m 644 -p -D common/logMacros.h ${MTCE_COMMON_INCLUDE}/logMacros.h
install -m 644 -p -D common/msgClass.h ${MTCE_COMMON_INCLUDE}/msgClass.h
install -m 644 -p -D common/nlEvent.h ${MTCE_COMMON_INCLUDE}/nlEvent.h
install -m 644 -p -D common/nodeBase.h ${MTCE_COMMON_INCLUDE}/nodeBase.h
install -m 644 -p -D common/nodeEvent.h ${MTCE_COMMON_INCLUDE}/nodeEvent.h
install -m 644 -p -D common/nodeMacro.h ${MTCE_COMMON_INCLUDE}/nodeMacro.h
install -m 644 -p -D common/nodeTimers.h ${MTCE_COMMON_INCLUDE}/nodeTimers.h
install -m 644 -p -D common/nodeUtil.h ${MTCE_COMMON_INCLUDE}/nodeUtil.h
install -m 644 -p -D common/pingUtil.h ${MTCE_COMMON_INCLUDE}/pingUtil.h
install -m 644 -p -D common/redfishUtil.h ${MTCE_COMMON_INCLUDE}/redfishUtil.h
install -m 644 -p -D common/regexUtil.h ${MTCE_COMMON_INCLUDE}/regexUtil.h
install -m 644 -p -D common/returnCodes.h ${MTCE_COMMON_INCLUDE}/returnCodes.h
install -m 644 -p -D common/secretUtil.h ${MTCE_COMMON_INCLUDE}/secretUtil.h
install -m 644 -p -D common/threadUtil.h ${MTCE_COMMON_INCLUDE}/threadUtil.h
install -m 644 -p -D common/timeUtil.h ${MTCE_COMMON_INCLUDE}/timeUtil.h
install -m 644 -p -D common/tokenUtil.h ${MTCE_COMMON_INCLUDE}/tokenUtil.h
install -m 755 -d ${MTCE_DAEMON_INCLUDE}
install -m 644 -p -D daemon/daemon_ini.h ${MTCE_DAEMON_INCLUDE}/daemon_ini.h
install -m 644 -p -D daemon/daemon_common.h ${MTCE_DAEMON_INCLUDE}/daemon_common.h
install -m 644 -p -D daemon/daemon_option.h ${MTCE_DAEMON_INCLUDE}/daemon_option.h

View File

@ -0,0 +1,2 @@
3.0 (quilt)

View File

@ -0,0 +1,7 @@
---
debname: mtce-common
debver: 1.0
src_path: src
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

View File

@ -61,13 +61,13 @@ static struct json_object * _json_verify_object ( struct json_object * obj,
struct json_object * req_obj = (struct json_object *)(NULL);
json_bool status = json_object_object_get_ex (obj, label, &req_obj);
if (( status == TRUE ) && ( req_obj ))
if (( status == true ) && ( req_obj ))
{
return (req_obj);
}
wlog ("Specified label '%s' not found in response\n", label );
status = json_object_object_get_ex (obj, "error", &req_obj );
if (( status == TRUE ) && ( req_obj ))
if (( status == true ) && ( req_obj ))
{
jlog ("Found 'error' label instead\n");
}
@ -84,7 +84,7 @@ json_object * _json_get_host_next ( struct json_object * obj )
/* Get the next host entity path */
struct json_object * next_obj = (struct json_object *)(NULL);
json_bool status = json_object_object_get_ex(obj, MTC_JSON_INV_NEXT, &next_obj );
if (( status == TRUE ) && ( next_obj ))
if (( status == true ) && ( next_obj ))
{
return (next_obj);
}
@ -154,7 +154,7 @@ string _json_get_key_value_string ( struct json_object * obj, const char * key )
/* Get the node uuid */
struct json_object * key_obj = (struct json_object *)(NULL);
json_bool status = json_object_object_get_ex(obj, key, &key_obj );
if ( ( status == TRUE ) && ( key_obj ))
if ( ( status == true ) && ( key_obj ))
{
value.append(json_object_get_string(key_obj));
}
@ -177,7 +177,7 @@ int jsonUtil_get_key_value_int ( struct json_object * obj, const char * key )
/* Get the node uuid */
struct json_object * key_obj = (struct json_object *)(NULL);
json_bool status = json_object_object_get_ex(obj, key, &key_obj);
if ( (status == TRUE ) && ( key_obj ))
if ( (status == true ) && ( key_obj ))
{
value = json_object_get_int(key_obj);
}
@ -191,7 +191,7 @@ bool jsonUtil_get_key_value_bool ( struct json_object * obj, const char * key )
/* Get the node uuid */
struct json_object * key_obj = (struct json_object *)(NULL);
json_bool status = json_object_object_get_ex(obj, key, &key_obj );
if (( status == TRUE ) && ( key_obj ))
if (( status == true ) && ( key_obj ))
{
value = json_object_get_boolean(key_obj);
}
@ -649,7 +649,7 @@ int jsonUtil_secret_load ( string & name,
}
status = json_object_object_get_ex(raw_obj, MTC_JSON_SECRET_LIST, &secret_obj );
if ( ( status == TRUE ) && ( secret_obj ))
if ( ( status == true ) && ( secret_obj ))
{
array_list_obj = json_object_get_array(secret_obj );
if ( array_list_obj )
@ -893,7 +893,7 @@ int jsonApi_auth_load ( string & hostname,
/* Get the token object */
status = json_object_object_get_ex(raw_obj, MTC_JSON_AUTH_TOKEN, &token_obj);
if (( status == TRUE ) && ( token_obj ))
if (( status == true ) && ( token_obj ))
{
info.issued.append (_json_get_key_value_string(token_obj, MTC_JSON_AUTH_ISSUE ));
info.expiry.append (_json_get_key_value_string(token_obj, MTC_JSON_AUTH_EXPIRE));
@ -906,7 +906,7 @@ int jsonApi_auth_load ( string & hostname,
/* Now look for the compute admin URL */
/* Get the token object */
status = json_object_object_get_ex(token_obj, MTC_JSON_AUTH_SVCCAT, &svccat_obj );
if (( status == TRUE ) && ( svccat_obj ))
if (( status == true ) && ( svccat_obj ))
{
array_list_obj = json_object_get_array(svccat_obj);
if ( array_list_obj )
@ -934,7 +934,7 @@ int jsonApi_auth_load ( string & hostname,
if ( found_type == true )
{
json_bool status = json_object_object_get_ex(tuple_obj, MTC_JSON_AUTH_ENDPOINTS, &end_obj);
if ( ( status == TRUE ) && ( end_obj ))
if ( ( status == true ) && ( end_obj ))
{
array_list_obj = json_object_get_array(end_obj);
if ( array_list_obj )
@ -1081,7 +1081,7 @@ int jsonApi_array_value ( char * json_str_ptr,
/* Now look in each array element for the 'search_key' */
status = json_object_object_get_ex(raw_obj, array_label.data(), &array_obj );
if (( status == TRUE ) && ( array_obj ))
if (( status == true ) && ( array_obj ))
{
/* Leaking array_list_obj ???? */
array_list_obj = json_object_get_array(array_obj);
@ -1169,7 +1169,7 @@ int jsonUtil_get_array_idx ( char * json_str_ptr,
/* Now look in each array element for the 'search_key' */
status = json_object_object_get_ex(raw_obj, label.data(), &array_obj );
if (( status == TRUE ) && ( array_obj ))
if (( status == true ) && ( array_obj ))
{
element.clear();
@ -1244,7 +1244,7 @@ int jsonUtil_array_elements ( char * json_str_ptr, string label, int & elements
/* Now look in each array element for the 'search_key' */
status = json_object_object_get_ex(raw_obj, label.data(), &array_obj );
if (( status == TRUE ) && ( array_obj ))
if (( status == true ) && ( array_obj ))
{
array_list_obj = json_object_get_array(array_obj);
if ( array_list_obj )

View File

@ -180,10 +180,10 @@ const char * get_mtcNodeCommand_str ( int cmd )
case MTC_EVENT_HEARTBEAT_RUNNING: return("heartbeat running");
case MTC_EVENT_HEARTBEAT_ILLHEALTH: return("heartbeat illhealth");
case MTC_EVENT_HEARTBEAT_STOPPED: return("heartbeat stopped");
case MTC_EVENT_HEARTBEAT_DEGRADE_SET:return("heartbeat degrade set");
case MTC_EVENT_HEARTBEAT_MINOR_CLR: return("heartbeat minor clear");
case MTC_EVENT_HEARTBEAT_DEGRADE_CLR:return("heartbeat degrade clear");
case MTC_EVENT_HEARTBEAT_MINOR_SET: return("heartbeat minor set");
case (int)MTC_EVENT_HEARTBEAT_DEGRADE_SET:return("heartbeat degrade set");
case (int)MTC_EVENT_HEARTBEAT_MINOR_CLR: return("heartbeat minor clear");
case (int)MTC_EVENT_HEARTBEAT_DEGRADE_CLR:return("heartbeat degrade clear");
case (int)MTC_EVENT_HEARTBEAT_MINOR_SET: return("heartbeat minor set");
/* degrade events */
case MTC_DEGRADE_RAISE: return ("degrade raise");
@ -191,7 +191,7 @@ const char * get_mtcNodeCommand_str ( int cmd )
/* general events */
case MTC_EVENT_LOOPBACK: return ("loopback");
case MTC_EVENT_MONITOR_READY: return ("monitor ready event");
case (int)MTC_EVENT_MONITOR_READY: return ("monitor ready event");
case MTC_EVENT_GOENABLE_FAIL: return ("goenable fail");
case MTC_EVENT_HOST_STALLED: return("host stalled event");
@ -237,12 +237,12 @@ const char * get_mtcNodeCommand_str ( int cmd )
case MTC_CMD_QRY_INST: return("query instance");
case MTC_CMD_VOTE_INST: return ("vote instance");
case MTC_CMD_NOTIFY_INST: return ("notify instance");
case MTC_EVENT_VOTE_NOTIFY: return ("notify instance event");
case (int)MTC_EVENT_VOTE_NOTIFY: return ("notify instance event");
/* service events */
case MTC_SERVICE_PMOND: return ("pmond service");
case MTC_SERVICE_HWMOND: return ("hwmond service");
case MTC_SERVICE_HEARTBEAT: return ("heartbeat service");
case (int)MTC_SERVICE_PMOND: return ("pmond service");
case (int)MTC_SERVICE_HWMOND: return ("hwmond service");
case (int)MTC_SERVICE_HEARTBEAT: return ("heartbeat service");
default:
break ;
}

View File

@ -1373,7 +1373,7 @@ string get_event_str ( int event_code )
{
switch ( event_code )
{
case MTC_EVENT_MONITOR_READY:
case (int)MTC_EVENT_MONITOR_READY:
return "ready" ;
case MTC_EVENT_PMOND_CLEAR:
case MTC_EVENT_PMON_CLEAR:

View File

@ -431,7 +431,7 @@ int redfishUtil_health_info ( string & hostname,
json_bool json_rc = json_object_object_get_ex( info_obj,
REDFISH_LABEL__STATUS,
&status_obj );
if (( json_rc == TRUE ) && ( status_obj ))
if (( json_rc == true ) && ( status_obj ))
{
status.state = jsonUtil_get_key_value_string( status_obj,
REDFISH_LABEL__STATE );
@ -559,7 +559,7 @@ int redfishUtil_get_bmc_info ( string & hostname,
json_bool json_rc = json_object_object_get_ex( json_obj,
REDFISH_LABEL__PROCESSOR,
&proc_obj );
if (( json_rc == TRUE ) && ( proc_obj ))
if (( json_rc == true ) && ( proc_obj ))
{
redfish_entity_status status ;
bmc_info.processors = jsonUtil_get_key_value_int ( proc_obj, REDFISH_LABEL__COUNT );
@ -582,7 +582,7 @@ int redfishUtil_get_bmc_info ( string & hostname,
json_rc = json_object_object_get_ex( json_obj,
REDFISH_LABEL__MEMORY,
&mem_obj );
if (( json_rc == TRUE ) && ( mem_obj ))
if (( json_rc == true ) && ( mem_obj ))
{
redfish_entity_status status ;
bmc_info.memory_in_gigs = jsonUtil_get_key_value_int ( mem_obj, REDFISH_LABEL__MEMORY_TOTAL );

View File

@ -0,0 +1,5 @@
mtce-compute (1.0-1) unstable; urgency=medium
* Initial release.
-- Tracey Bogue <tracey.bogue@windriver.com> Mon, 12 Oct 2021 12:34:42 +0000

View File

@ -0,0 +1,15 @@
Source: mtce-compute
Section: admin
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13),
libsystemd-dev
Standards-Version: 4.5.1
Homepage: https://www.starlingx.io
Package: mtce-compute
Architecture: any
Depends: ${misc:Depends}, qemu
Description: StarlingX Compute Node Maintenance Package
This package contains maintenance support files for the compute-only
node type.

View File

@ -0,0 +1,41 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mtce-compute
Source: https://opendev.org/starlingx/metal
Files: *
Copyright: (c) 2013-2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.

View File

@ -0,0 +1,3 @@
etc/goenabled.d/virt-support-goenabled.sh
etc/init.d/goenabledWorker
lib/systemd/system/goenabled-worker.service

View File

@ -0,0 +1,18 @@
#!/usr/bin/make -f
# export DH_VERBOSE = 1
export ROOT = debian/tmp
export GODIR = $(ROOT)/etc/goenabled.d
export INITDIR = $(ROOT)/etc/init.d
export SYSTEMDDIR = $(ROOT)/lib/systemd/system
%:
dh $@
override_dh_auto_install:
install -m 755 -d $(GODIR)
install -m 755 -p -D scripts/virt-support-goenabled.sh $(GODIR)
install -m 755 -d $(INITDIR)
install -m 755 -p -D scripts/goenabled $(INITDIR)/goenabledWorker
install -m 755 -d $(SYSTEMDDIR)
install -m 644 -p -D scripts/goenabled-worker.service $(SYSTEMDDIR)

View File

@ -0,0 +1,2 @@
3.0 (quilt)

View File

@ -0,0 +1,7 @@
---
debname: mtce-compute
debver: 1.0
src_path: src
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

View File

@ -0,0 +1,5 @@
mtce-control (1.0-1) unstable; urgency=medium
* Initial release.
-- Tracey Bogue <tracey.bogue@windriver.com> Mon, 12 Oct 2021 13:29:42 +0000

View File

@ -0,0 +1,15 @@
Source: mtce-control
Section: admin
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13),
libsystemd-dev
Standards-Version: 4.5.1
Homepage: https://www.starlingx.io
Package: mtce-control
Architecture: any
Depends: ${misc:Depends}, lighttpd, qemu
Description: StarlingX Platform Controller Node Maintenance Package
This package contains maintenance support files for the controller-only
node type.

View File

@ -0,0 +1,41 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mtce-control
Source: https://opendev.org/starlingx/metal
Files: *
Copyright: (c) 2013-2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.

View File

@ -0,0 +1,4 @@
etc/init.d/goenabledControl
etc/init.d/hbsAgent
etc/pmon.d/hbsAgent.conf
lib/systemd/system/hbsAgent.service

View File

@ -0,0 +1,19 @@
#!/usr/bin/make -f
# export DH_VERBOSE = 1
export ROOT = debian/tmp
export INITDIR = $(ROOT)/etc/init.d
export PMONDIR = $(ROOT)/etc/pmon.d
export SYSTEMDDIR = $(ROOT)/lib/systemd/system
%:
dh $@
override_dh_auto_install:
install -m 755 -d $(INITDIR)
install -m 755 -p -D scripts/goenabled $(INITDIR)/goenabledControl
install -m 755 -p -D scripts/hbsAgent $(INITDIR)
install -m 755 -d $(PMONDIR)
install -m 644 -p -D scripts/hbsAgent.conf $(PMONDIR)
install -m 755 -d $(SYSTEMDDIR)
install -m 644 -p -D scripts/hbsAgent.service $(SYSTEMDDIR)

View File

@ -0,0 +1,2 @@
3.0 (quilt)

View File

@ -0,0 +1,7 @@
---
debname: mtce-control
debver: 1.0
src_path: src
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

View File

@ -0,0 +1,5 @@
mtce-storage (1.0-1) unstable; urgency=medium
* Initial release.
-- Tracey Bogue <tracey.bogue@windriver.com> Mon, 12 Oct 2021 14:03:42 +0000

View File

@ -0,0 +1,15 @@
Source: mtce-storage
Section: admin
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13),
libsystemd-dev
Standards-Version: 4.5.1
Homepage: https://www.starlingx.io
Package: mtce-storage
Architecture: any
Depends: ${misc:Depends}
Description: StarlingX Platform Storage Node Maintenance Package
This package contains maintenance support files for the storage-only
node type.

View File

@ -0,0 +1,41 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mtce-storage
Source: https://opendev.org/starlingx/metal
Files: *
Copyright: (c) 2013-2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.

View File

@ -0,0 +1,2 @@
etc/init.d/goenabledStorage
lib/systemd/system/goenabled-storage.service

View File

@ -0,0 +1,15 @@
#!/usr/bin/make -f
# export DH_VERBOSE = 1
export ROOT = debian/tmp
export INITDIR = $(ROOT)/etc/init.d
export SYSTEMDDIR = $(ROOT)/lib/systemd/system
%:
dh $@
override_dh_auto_install:
install -m 755 -d $(INITDIR)
install -m 755 -p -D scripts/goenabled $(INITDIR)/goenabledStorage
install -m 755 -d $(SYSTEMDDIR)
install -m 644 -p -D scripts/goenabled-storage.service $(SYSTEMDDIR)

View File

@ -0,0 +1 @@
3.0 (quilt)

View File

@ -0,0 +1,7 @@
---
debname: mtce-storage
debver: 1.0
src_path: src
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

View File

@ -0,0 +1,5 @@
mtce (1.0-1) unstable; urgency=medium
* Initial release.
-- Tracey Bogue <tracey.bogue@windriver.com> Wed, 13 Oct 2021 13:02:42 +0000

View File

@ -0,0 +1,76 @@
Source: mtce
Section: admin
Priority: optional
Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper-compat (= 13),
expect,
fm-common-dev,
fm-mgr,
libevent-dev,
libjson-c-dev,
libssl-dev,
libsystemd-dev,
mtce-common-dev (>= 1.0),
postgresql,
uuid-dev,
cppcheck
Standards-Version: 4.5.1
Homepage: https://www.starlingx.io
Package: mtce
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, ipmitool, redfishtool
Description: StarlingX Host Maintenance Services
The host maintenance services package contains a suite of daemons that
provide host maintainability and a high level of fault detection with
automatic notification and recovery.The Maintenance Service (mtcAgent
and mtcClient) manages hosts according to an abbreviated version of the
CCITT X.731 ITU specification. The Heartbeat Service (hbsAgent and
hbsClient) adds fast failure detection over the management and infstructure
networks. The Process Monitor service (pmond) add both passive and active
process monitoring and automatic recovery of stopped or killed processes.
The File System Monitor 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 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: mtce-dev
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: StarlingX Maintenance Software Development Package
The StarlingX Maintenance Software Development package contains
header files and related items necessary for software development.
Package: mtce-pmon
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: StarlingX Maintenance Process Monitor Service
The process monitor (pmond) service provides passive (pid), active (msg)
and status (qry) process monitoring with automatic recovery and failure
reporting of registered failed processes.
Package: mtce-hwmon
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, redfishtool
Description: StarlingX Maintenance Hardware Monitor Package
The host maintenance hardware monitor service (hwmond) adds in and out of
service hardware sensor monitoring, alarming and recovery handling.
Package: mtce-hostw
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: StarlingX Host Watchdog Package
The Host Watchdog (hostwd) daemon watches for errors in pmond and logs
system information on error.
Package: mtce-lmon
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: StarlingX Maintenance Link Monitor Package
The link monitor service (lmond) provides netlink monitoring for
provisioned oam, mgmt and cluster-host interfaces.

View File

@ -0,0 +1,41 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: mtce
Source: https://opendev.org/starlingx/metal
Files: *
Copyright: (c) 2013-2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2021 Wind River Systems, Inc
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
.
https://www.apache.org/licenses/LICENSE-2.0
.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
.
On Debian-based systems the full text of the Apache version 2.0 license
can be found in `/usr/share/common-licenses/Apache-2.0'.

View File

@ -0,0 +1 @@
usr/include/mtceHbsCluster.h

View File

@ -0,0 +1,5 @@
etc/init.d/hostw
etc/logrotate.d/hostw.logrotate
etc/mtc/hostwd.conf
lib/systemd/system/hostw.service
usr/bin/hostwd

View File

@ -0,0 +1,6 @@
etc/init.d/hwmon
etc/logrotate.d/hwmon.logrotate
etc/mtc/hwmond.conf
lib/systemd/system/hwmon.service
usr/lib/ocf/resource.d/platform/hwmon
usr/bin/hwmond

View File

@ -0,0 +1,6 @@
etc/init.d/lmon
etc/logrotate.d/lmon.logrotate
etc/mtc/lmond.conf
etc/pmon.d/lmon.conf
lib/systemd/system/lmon.service
usr/bin/lmond

View File

@ -0,0 +1,11 @@
etc/init.d/pmon
etc/logrotate.d/pmon.logrotate
etc/mtc/pmond.conf
lib/systemd/system/pmon.service
usr/lib/libamon.so
usr/lib/libamon.so.1
usr/lib/libamon.so.1.0
usr/bin/pmond
usr/sbin/pmon-restart
usr/sbin/pmon-start
usr/sbin/pmon-stop

View File

@ -0,0 +1,54 @@
etc/bmc/server_profiles.d/sensor_hp360_v1_ilo_v4.profile
etc/bmc/server_profiles.d/sensor_hp380_v1_ilo_v4.profile
etc/bmc/server_profiles.d/sensor_quanta_v1_ilo_v4.profile
etc/collect.d/collect_bmc
etc/init.d/crashDumpMgr
etc/init.d/fsmon
etc/init.d/goenabled
etc/init.d/hbsClient
etc/init.d/mtcClient
etc/init.d/mtcalarm
etc/init.d/mtclog
etc/init.d/runservices
etc/logrotate.d/crashdump.logrotate
etc/logrotate.d/fsmon.logrotate
etc/logrotate.d/mtcalarm.logrotate
etc/logrotate.d/mtce.logrotate
etc/mtc.conf
etc/mtc.ini
etc/mtc/fsmond.conf
etc/mtc/tmp
etc/pmon.d/acpid.conf
etc/pmon.d/fsmon.conf
etc/pmon.d/hbsClient.conf
etc/pmon.d/mtcClient.conf
etc/pmon.d/mtcalarm.conf
etc/pmon.d/mtclogd.conf
etc/pmon.d/nslcd.conf
etc/pmon.d/sshd.conf
etc/pmon.d/syslog-ng.conf
etc/services.d/controller/mtcTest
etc/services.d/storage/mtcTest
etc/services.d/worker/mtcTest
etc/syslog-ng/conf.d/mtce.conf
lib/systemd/system/crashDumpMgr.service
lib/systemd/system/fsmon.service
lib/systemd/system/goenabled.service
lib/systemd/system/hbsClient.service
lib/systemd/system/mtcClient.service
lib/systemd/system/mtcalarm.service
lib/systemd/system/mtclog.service
lib/systemd/system/runservices.service
usr/bin/fsmond
usr/bin/hbsAgent
usr/bin/hbsClient
usr/bin/mtcAgent
usr/bin/mtcClient
usr/bin/mtcalarmd
usr/bin/mtclogd
usr/bin/wipedisk
usr/lib/ocf/resource.d/platform/mtcAgent
usr/sbin/dmemchk.sh
usr/sbin/fsync
usr/share/mtce/hwclock.service
usr/share/mtce/hwclock.sh

View File

@ -0,0 +1,23 @@
#!/bin/sh
set -e
#DEBHELPER#
case "$1" in
configure)
# Replace the default hwclock.sh with our copy
if [ -e /etc/init.d/hwclock.sh ]; then
mv -f /etc/init.d/hwclock.sh /etc/init.d/hwclock.sh.dpkg-bak
fi
cp -a /usr/share/mtce/hwclock.sh /etc/init.d/hwclock.sh
# Replace the default hwclock.service with our copy
if [ -e /lib/systemd/system/hwclock.service ]; then
mv -f /lib/systemd/system/hwclock.service /lib/systemd/system/hwclock.service.bak
fi
cp -a /usr/share/mtce/hwclock.service /lib/systemd/system/hwclock.service
;;
*)
echo "mtce postinst called with an unknown argument \`$1'" >&2
exit 1
;;
esac

View File

@ -0,0 +1,166 @@
#!/usr/bin/make -f
# export DH_VERBOSE = 1
export ROOT = debian/tmp
export BINDIR = $(ROOT)/usr/bin
export LIBDIR = $(ROOT)/usr/lib
export MTCESHAREDIR = $(ROOT)/usr/share/mtce
export OCFPLATFORMDIR = $(ROOT)/usr/lib/ocf/resource.d/platform
export SBINDIR = $(ROOT)/usr/sbin
export UNITDIR=$(ROOT)/lib/systemd/system
export SYSCONFDIR = $(ROOT)/etc
export BMCCONFDIR = $(SYSCONFDIR)/bmc/server_profiles.d
export COLLECTDIR = $(SYSCONFDIR)/collect.d
export INITDIR =$(SYSCONFDIR)/init.d
export LOGDIR = $(SYSCONFDIR)/logrotate.d
export PMONDIR = $(SYSCONFDIR)/pmon.d
export SERVICESDIR = $(SYSCONFDIR)/services.d
export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
export MAJOR = $(shell echo $(DEB_VERSION) | cut -d. -f1)
export MINOR = $(shell echo $(shell echo $(DEB_VERSION) | cut -d. -f2) | cut -d- -f1)
%:
dh $@
override_dh_auto_install:
# Resource agent files
install -m 755 -d $(SYSCONFDIR)
install -m 755 -d $(SYSCONFDIR)/mtc
install -m 755 -d $(SYSCONFDIR)/mtc/tmp
install -m 755 -d $(OCFPLATFORMDIR)
install -m 755 -p -D scripts/mtcAgent $(OCFPLATFORMDIR)/mtcAgent
install -m 755 -p -D hwmon/scripts/ocf/hwmon $(OCFPLATFORMDIR)/hwmon
# Configuration files
install -m 600 -p -D scripts/mtc.ini $(SYSCONFDIR)/mtc.ini
install -m 600 -p -D scripts/mtc.conf $(SYSCONFDIR)/mtc.conf
install -m 600 -p -D fsmon/scripts/fsmond.conf $(SYSCONFDIR)/mtc/fsmond.conf
install -m 600 -p -D hwmon/scripts/hwmond.conf $(SYSCONFDIR)/mtc/hwmond.conf
install -m 600 -p -D pmon/scripts/pmond.conf $(SYSCONFDIR)/mtc/pmond.conf
install -m 600 -p -D lmon/scripts/lmond.conf $(SYSCONFDIR)/mtc/lmond.conf
install -m 600 -p -D hostw/scripts/hostwd.conf $(SYSCONFDIR)/mtc/hostwd.conf
install -m 755 -d $(BMCCONFDIR)
install -m 644 -p -D scripts/sensor_hp360_v1_ilo_v4.profile $(BMCCONFDIR)/sensor_hp360_v1_ilo_v4.profile
install -m 644 -p -D scripts/sensor_hp380_v1_ilo_v4.profile $(BMCCONFDIR)/sensor_hp380_v1_ilo_v4.profile
install -m 644 -p -D scripts/sensor_quanta_v1_ilo_v4.profile $(BMCCONFDIR)/sensor_quanta_v1_ilo_v4.profile
# Binaries
install -m 755 -d $(BINDIR)
install -m 700 -p -D maintenance/mtcAgent $(BINDIR)/mtcAgent
install -m 700 -p -D maintenance/mtcClient $(BINDIR)/mtcClient
install -m 700 -p -D heartbeat/hbsAgent $(BINDIR)/hbsAgent
install -m 700 -p -D heartbeat/hbsClient $(BINDIR)/hbsClient
install -m 700 -p -D pmon/pmond $(BINDIR)/pmond
install -m 700 -p -D lmon/lmond $(BINDIR)/lmond
install -m 700 -p -D hostw/hostwd $(BINDIR)/hostwd
install -m 700 -p -D fsmon/fsmond $(BINDIR)/fsmond
install -m 700 -p -D hwmon/hwmond $(BINDIR)/hwmond
install -m 700 -p -D mtclog/mtclogd $(BINDIR)/mtclogd
install -m 700 -p -D alarm/mtcalarmd $(BINDIR)/mtcalarmd
install -m 700 -p -D scripts/wipedisk $(BINDIR)/wipedisk
install -m 755 -d $(SBINDIR)
install -m 700 -p -D fsync/fsync $(SBINDIR)/fsync
install -m 755 -d $(SBINDIR)
install -m 700 -p -D pmon/scripts/pmon-restart $(SBINDIR)/pmon-restart
install -m 700 -p -D pmon/scripts/pmon-start $(SBINDIR)/pmon-start
install -m 700 -p -D pmon/scripts/pmon-stop $(SBINDIR)/pmon-stop
# init script files
install -m 755 -d $(INITDIR)
install -m 755 -p -D scripts/crashDumpMgr $(INITDIR)/crashDumpMgr
install -m 700 -p -D scripts/mtcClient $(INITDIR)/mtcClient
install -m 700 -p -D scripts/hbsClient $(INITDIR)/hbsClient
install -m 700 -p -D hwmon/scripts/lsb/hwmon $(INITDIR)/hwmon
install -m 700 -p -D fsmon/scripts/fsmon $(INITDIR)/fsmon
install -m 700 -p -D scripts/mtclog $(INITDIR)/mtclog
install -m 700 -p -D pmon/scripts/pmon $(INITDIR)/pmon
install -m 700 -p -D lmon/scripts/lmon $(INITDIR)/lmon
install -m 700 -p -D hostw/scripts/hostw $(INITDIR)/hostw
install -m 700 -p -D alarm/scripts/mtcalarm.init $(INITDIR)/mtcalarm
# Some files already exist in the system.
# We need to copy them to a generic location here and update them during
# a post install step.
install -m 755 -d $(MTCESHAREDIR)
install -m 755 -p -D scripts/hwclock.sh $(MTCESHAREDIR)/hwclock.sh
install -m 644 -p -D scripts/hwclock.service $(MTCESHAREDIR)/hwclock.service
# systemd service files
install -m 755 -d $(UNITDIR)
install -m 644 -p -D fsmon/scripts/fsmon.service $(UNITDIR)/fsmon.service
install -m 644 -p -D hwmon/scripts/hwmon.service $(UNITDIR)/hwmon.service
install -m 644 -p -D pmon/scripts/pmon.service $(UNITDIR)/pmon.service
install -m 644 -p -D hostw/scripts/hostw.service $(UNITDIR)/hostw.service
install -m 644 -p -D scripts/crashDumpMgr.service $(UNITDIR)/crashDumpMgr.service
install -m 644 -p -D scripts/mtcClient.service $(UNITDIR)/mtcClient.service
install -m 644 -p -D scripts/hbsClient.service $(UNITDIR)/hbsClient.service
install -m 644 -p -D scripts/mtclog.service $(UNITDIR)/mtclog.service
install -m 644 -p -D scripts/goenabled.service $(UNITDIR)/goenabled.service
install -m 644 -p -D scripts/runservices.service $(UNITDIR)/runservices.service
install -m 644 -p -D alarm/scripts/mtcalarm.service $(UNITDIR)/mtcalarm.service
install -m 644 -p -D lmon/scripts/lmon.service $(UNITDIR)/lmon.service
# go enabled script
install -m 755 -p -D scripts/goenabled $(INITDIR)/goenabled
# Start/stop services test script
install -m 755 -d $(SERVICESDIR)
install -m 755 -d $(SERVICESDIR)/controller
install -m 755 -p -D scripts/mtcTest $(SERVICESDIR)/controller
install -m 755 -d $(SERVICESDIR)/storage
install -m 755 -p -D scripts/mtcTest $(SERVICESDIR)/storage
install -m 755 -d $(SERVICESDIR)/worker
install -m 755 -p -D scripts/mtcTest $(SERVICESDIR)/worker
install -m 755 -p -D scripts/runservices $(INITDIR)/runservices
# Test tools
install -m 755 -p -D scripts/dmemchk.sh $(SBINDIR)
# Process monitor config files
install -m 755 -d $(PMONDIR)
install -m 644 -p -D scripts/mtcClient.conf $(PMONDIR)/mtcClient.conf
install -m 644 -p -D scripts/hbsClient.conf $(PMONDIR)/hbsClient.conf
install -m 644 -p -D pmon/scripts/acpid.conf $(PMONDIR)/acpid.conf
install -m 644 -p -D pmon/scripts/sshd.conf $(PMONDIR)/sshd.conf
install -m 644 -p -D pmon/scripts/syslog-ng.conf $(PMONDIR)/syslog-ng.conf
install -m 644 -p -D pmon/scripts/nslcd.conf $(PMONDIR)/nslcd.conf
install -m 644 -p -D fsmon/scripts/fsmon.conf $(PMONDIR)/fsmon.conf
install -m 644 -p -D scripts/mtclogd.conf $(PMONDIR)/mtclogd.conf
install -m 644 -p -D alarm/scripts/mtcalarm.pmon.conf $(PMONDIR)/mtcalarm.conf
install -m 644 -p -D lmon/scripts/lmon.pmon.conf $(PMONDIR)/lmon.conf
# Log rotation
install -m 755 -d $(LOGDIR)
install -m 644 -p -D scripts/crashdump.logrotate $(LOGDIR)/crashdump.logrotate
install -m 644 -p -D scripts/mtce.logrotate $(LOGDIR)/mtce.logrotate
install -m 644 -p -D hostw/scripts/hostw.logrotate $(LOGDIR)/hostw.logrotate
install -m 644 -p -D pmon/scripts/pmon.logrotate $(LOGDIR)/pmon.logrotate
install -m 644 -p -D lmon/scripts/lmon.logrotate $(LOGDIR)/lmon.logrotate
install -m 644 -p -D fsmon/scripts/fsmon.logrotate $(LOGDIR)/fsmon.logrotate
install -m 644 -p -D hwmon/scripts/hwmon.logrotate $(LOGDIR)/hwmon.logrotate
install -m 644 -p -D alarm/scripts/mtcalarm.logrotate $(LOGDIR)/mtcalarm.logrotate
# Collect scripts
install -m 755 -d $(COLLECTDIR)
install -m 755 -p -D scripts/collect_bmc.sh $(COLLECTDIR)/collect_bmc
# syslog configuration
install -m 644 -p -D scripts/mtce.syslog $(SYSCONFDIR)/syslog-ng/conf.d/mtce.conf
# Software development files
install -m 644 -p -D heartbeat/mtceHbsCluster.h $(ROOT)/usr/include/mtceHbsCluster.h
install -m 755 -d $(LIBDIR)
install -m 755 -p -D public/libamon.so.$(MAJOR) $(LIBDIR)/libamon.so.$(MAJOR)
cd $(LIBDIR) ; ln -s libamon.so.$(MAJOR) libamon.so.$(MAJOR).$(MINOR)
cd $(LIBDIR) ; ln -s libamon.so.$(MAJOR) libamon.so
# Volatile directories
install -m 755 -d $(ROOT)/var
install -m 755 -d $(ROOT)/var/run
override_dh_usrlocal:
echo "SKIPPING DH USRLOCAL"

View File

@ -0,0 +1,2 @@
3.0 (quilt)

View File

@ -0,0 +1,7 @@
---
debname: mtce
debver: 1.0
src_path: src
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

View File

@ -0,0 +1,4 @@
etc/init.d/hostw
etc/logrotate.d/hostw.logrotate
etc/mtc/hostwd.conf
usr/local/bin/hostwd

View File

@ -1238,7 +1238,7 @@ int hwmonHostClass::bmc_sensor_monitor ( struct hwmonHostClass::hwmon_host * hos
{
/* Look for ... BMC_JSON__SENSOR_DATA_MESSAGE_HEADER */
status = json_object_object_get_ex ( raw_obj, BMC_JSON__SENSOR_DATA_MESSAGE_HEADER, &req_obj );
if (( status == TRUE ) && req_obj )
if (( status == true ) && req_obj )
{
char * msg_ptr = (char*)json_object_to_json_string(req_obj) ;
host_ptr->json_bmc_sensors = msg_ptr ;

View File

@ -35,7 +35,7 @@ string _get_key_value_string ( struct json_object * obj, const char * key )
/* use the new API ;
* json_object_object_get is depricated and yields compile warning */
json_bool status = json_object_object_get_ex(obj, key, &key_obj);
if ( ( status == TRUE ) && key_obj )
if ( ( status == true ) && key_obj )
{
value.append(json_object_get_string(key_obj));
}

View File

@ -2000,7 +2000,7 @@ void load_mtcInfo_msg ( mtc_message_type & msg )
json_bool json_rc = json_object_object_get_ex( _obj,
"mtcInfo",
&info_obj );
if ( ( json_rc == TRUE ) && ( info_obj ))
if ( ( json_rc == true ) && ( info_obj ))
{
struct json_object *ctrl_obj = (struct json_object *)(NULL);
json_bool json_rc =
@ -2008,7 +2008,7 @@ void load_mtcInfo_msg ( mtc_message_type & msg )
peer_controller.hostname.data(),
&ctrl_obj );
if (( json_rc == TRUE ) && ( ctrl_obj ))
if (( json_rc == true ) && ( ctrl_obj ))
{
peer_controller.host_ip = jsonUtil_get_key_value_string(ctrl_obj, MTC_JSON_INV_HOSTIP) ;
peer_controller.bm_ip = jsonUtil_get_key_value_string(ctrl_obj, MTC_JSON_INV_BMIP) ;