Change heartbeat-status to availablity-state of system peer
Fix availablity-state field is missing of system peer Test Plan: - PASS: Create/Update the system peer check the availability- state is exist in CLI. - PASS: Get details of the system peer check the availability- state is exist in CLI. Closes-Bug: 2045717 Depends-On: I497e3d21355c08d000a77965e6a6f36c6f483936 Change-Id: I07268732b9fab22a21e32dee8f22cc615f372461 Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
This commit is contained in:
parent
9d384d63b1
commit
2c9ee0ea97
|
@ -28,7 +28,7 @@ class SystemPeer(base.Resource):
|
||||||
heartbeat_failure_threshold,
|
heartbeat_failure_threshold,
|
||||||
heartbeat_failure_policy,
|
heartbeat_failure_policy,
|
||||||
heartbeat_maintenance_timeout,
|
heartbeat_maintenance_timeout,
|
||||||
heartbeat_status,
|
availability_state,
|
||||||
created_at,
|
created_at,
|
||||||
updated_at):
|
updated_at):
|
||||||
self.manager = manager
|
self.manager = manager
|
||||||
|
@ -43,7 +43,7 @@ class SystemPeer(base.Resource):
|
||||||
self.heartbeat_failure_threshold = heartbeat_failure_threshold
|
self.heartbeat_failure_threshold = heartbeat_failure_threshold
|
||||||
self.heartbeat_failure_policy = heartbeat_failure_policy
|
self.heartbeat_failure_policy = heartbeat_failure_policy
|
||||||
self.heartbeat_maintenance_timeout = heartbeat_maintenance_timeout
|
self.heartbeat_maintenance_timeout = heartbeat_maintenance_timeout
|
||||||
self.heartbeat_status = heartbeat_status
|
self.availability_state = availability_state
|
||||||
self.created_at = created_at
|
self.created_at = created_at
|
||||||
self.updated_at = updated_at
|
self.updated_at = updated_at
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ class system_peer_manager(base.ResourceManager):
|
||||||
heartbeat_failure_policy=json_object['heartbeat-failure-policy'],
|
heartbeat_failure_policy=json_object['heartbeat-failure-policy'],
|
||||||
heartbeat_maintenance_timeout=json_object[
|
heartbeat_maintenance_timeout=json_object[
|
||||||
'heartbeat-maintenance-timeout'],
|
'heartbeat-maintenance-timeout'],
|
||||||
heartbeat_status=json_object['heartbeat-status'],
|
availability_state=json_object['availability-state'],
|
||||||
created_at=json_object['created-at'],
|
created_at=json_object['created-at'],
|
||||||
updated_at=json_object['updated-at'])
|
updated_at=json_object['updated-at'])
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ def detail_peer_format(system_peer=None):
|
||||||
'heartbeat failure threshold',
|
'heartbeat failure threshold',
|
||||||
'heartbeat failure policy',
|
'heartbeat failure policy',
|
||||||
'heartbeat maintenance timeout',
|
'heartbeat maintenance timeout',
|
||||||
'heartbeat status',
|
'availability state',
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at',
|
'updated_at',
|
||||||
)
|
)
|
||||||
|
@ -97,7 +97,7 @@ def detail_peer_format(system_peer=None):
|
||||||
system_peer.heartbeat_failure_threshold,
|
system_peer.heartbeat_failure_threshold,
|
||||||
system_peer.heartbeat_failure_policy,
|
system_peer.heartbeat_failure_policy,
|
||||||
system_peer.heartbeat_maintenance_timeout,
|
system_peer.heartbeat_maintenance_timeout,
|
||||||
system_peer.heartbeat_status,
|
system_peer.availability_state,
|
||||||
system_peer.created_at,
|
system_peer.created_at,
|
||||||
system_peer.updated_at,
|
system_peer.updated_at,
|
||||||
)
|
)
|
||||||
|
|
|
@ -28,7 +28,7 @@ HEARTBEAT_INTERVAL = 10
|
||||||
HEARTBEAT_FAILURE_THRESHOLD = 3
|
HEARTBEAT_FAILURE_THRESHOLD = 3
|
||||||
HEARTBEAT_FAILURES_POLICY = 'alarm'
|
HEARTBEAT_FAILURES_POLICY = 'alarm'
|
||||||
HEARTBEAT_MAINTENANCE_TIMEOUT = 600
|
HEARTBEAT_MAINTENANCE_TIMEOUT = 600
|
||||||
HEARTBEAT_STATUS = 'alive'
|
AVAILABILITY_STATE = 'available'
|
||||||
PEER_CONTROLLER_GATEWAY_IP = '128.128.128.1'
|
PEER_CONTROLLER_GATEWAY_IP = '128.128.128.1'
|
||||||
TIME_NOW = timeutils.utcnow().isoformat()
|
TIME_NOW = timeutils.utcnow().isoformat()
|
||||||
NEW_PEER_CONTROLLER_GATEWAY_IP = '128.1.1.1'
|
NEW_PEER_CONTROLLER_GATEWAY_IP = '128.1.1.1'
|
||||||
|
@ -55,7 +55,7 @@ SYSTEM_PEER_DICT = {
|
||||||
'HEARTBEAT_FAILURE_THRESHOLD': HEARTBEAT_FAILURE_THRESHOLD,
|
'HEARTBEAT_FAILURE_THRESHOLD': HEARTBEAT_FAILURE_THRESHOLD,
|
||||||
'HEARTBEAT_FAILURE_POLICY': HEARTBEAT_FAILURES_POLICY,
|
'HEARTBEAT_FAILURE_POLICY': HEARTBEAT_FAILURES_POLICY,
|
||||||
'HEARTBEAT_MAINTENANCE_TIMEOUT': HEARTBEAT_MAINTENANCE_TIMEOUT,
|
'HEARTBEAT_MAINTENANCE_TIMEOUT': HEARTBEAT_MAINTENANCE_TIMEOUT,
|
||||||
'HEARTBEAT_STATUS': HEARTBEAT_STATUS,
|
'AVAILABILITY_STATE': AVAILABILITY_STATE,
|
||||||
'PEER_CONTROLLER_GATEWAY_IP': PEER_CONTROLLER_GATEWAY_IP,
|
'PEER_CONTROLLER_GATEWAY_IP': PEER_CONTROLLER_GATEWAY_IP,
|
||||||
'CREATED_AT': TIME_NOW,
|
'CREATED_AT': TIME_NOW,
|
||||||
'UPDATED_AT': TIME_NOW
|
'UPDATED_AT': TIME_NOW
|
||||||
|
@ -76,7 +76,7 @@ SYSTEM_PEER = spm.SystemPeer(
|
||||||
heartbeat_failure_policy=SYSTEM_PEER_DICT['HEARTBEAT_FAILURE_POLICY'],
|
heartbeat_failure_policy=SYSTEM_PEER_DICT['HEARTBEAT_FAILURE_POLICY'],
|
||||||
heartbeat_maintenance_timeout=SYSTEM_PEER_DICT[
|
heartbeat_maintenance_timeout=SYSTEM_PEER_DICT[
|
||||||
'HEARTBEAT_MAINTENANCE_TIMEOUT'],
|
'HEARTBEAT_MAINTENANCE_TIMEOUT'],
|
||||||
heartbeat_status=SYSTEM_PEER_DICT['HEARTBEAT_STATUS'],
|
availability_state=SYSTEM_PEER_DICT['AVAILABILITY_STATE'],
|
||||||
peer_controller_gateway_address=SYSTEM_PEER_DICT[
|
peer_controller_gateway_address=SYSTEM_PEER_DICT[
|
||||||
'PEER_CONTROLLER_GATEWAY_IP'],
|
'PEER_CONTROLLER_GATEWAY_IP'],
|
||||||
created_at=SYSTEM_PEER_DICT['CREATED_AT'],
|
created_at=SYSTEM_PEER_DICT['CREATED_AT'],
|
||||||
|
@ -152,7 +152,7 @@ class TestCLISystemPeerManagerV1(base.BaseCommandTest):
|
||||||
HEARTBEAT_FAILURE_THRESHOLD,
|
HEARTBEAT_FAILURE_THRESHOLD,
|
||||||
HEARTBEAT_FAILURES_POLICY,
|
HEARTBEAT_FAILURES_POLICY,
|
||||||
HEARTBEAT_MAINTENANCE_TIMEOUT,
|
HEARTBEAT_MAINTENANCE_TIMEOUT,
|
||||||
HEARTBEAT_STATUS,
|
AVAILABILITY_STATE,
|
||||||
TIME_NOW,
|
TIME_NOW,
|
||||||
TIME_NOW),
|
TIME_NOW),
|
||||||
actual_call[1])
|
actual_call[1])
|
||||||
|
@ -206,7 +206,7 @@ class TestCLISystemPeerManagerV1(base.BaseCommandTest):
|
||||||
HEARTBEAT_FAILURE_THRESHOLD,
|
HEARTBEAT_FAILURE_THRESHOLD,
|
||||||
HEARTBEAT_FAILURES_POLICY,
|
HEARTBEAT_FAILURES_POLICY,
|
||||||
HEARTBEAT_MAINTENANCE_TIMEOUT,
|
HEARTBEAT_MAINTENANCE_TIMEOUT,
|
||||||
HEARTBEAT_STATUS,
|
AVAILABILITY_STATE,
|
||||||
TIME_NOW,
|
TIME_NOW,
|
||||||
TIME_NOW),
|
TIME_NOW),
|
||||||
actual_call[1])
|
actual_call[1])
|
||||||
|
@ -233,7 +233,7 @@ class TestCLISystemPeerManagerV1(base.BaseCommandTest):
|
||||||
HEARTBEAT_FAILURE_THRESHOLD,
|
HEARTBEAT_FAILURE_THRESHOLD,
|
||||||
HEARTBEAT_FAILURES_POLICY,
|
HEARTBEAT_FAILURES_POLICY,
|
||||||
HEARTBEAT_MAINTENANCE_TIMEOUT,
|
HEARTBEAT_MAINTENANCE_TIMEOUT,
|
||||||
HEARTBEAT_STATUS,
|
AVAILABILITY_STATE,
|
||||||
TIME_NOW,
|
TIME_NOW,
|
||||||
TIME_NOW),
|
TIME_NOW),
|
||||||
actual_call[1])
|
actual_call[1])
|
||||||
|
|
Loading…
Reference in New Issue