Merge "Dmi plugin watchdog cheking aliveness"
diff --git a/.github/workflows/gerrit-merge.yaml b/.github/workflows/gerrit-merge.yaml
deleted file mode 100644
index 76335e7..0000000
--- a/.github/workflows/gerrit-merge.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-name: Gerrit Merge
-
-# yamllint disable-line rule:truthy
-on:
- workflow_dispatch:
- inputs:
- GERRIT_BRANCH:
- description: "Branch that change is against"
- required: true
- type: string
- GERRIT_CHANGE_ID:
- description: "The ID for the change"
- required: true
- type: string
- GERRIT_CHANGE_NUMBER:
- description: "The Gerrit number"
- required: true
- type: string
- GERRIT_CHANGE_URL:
- description: "URL to the change"
- required: true
- type: string
- GERRIT_EVENT_TYPE:
- description: "Type of Gerrit event"
- required: true
- type: string
- GERRIT_PATCHSET_NUMBER:
- description: "The patch number for the change"
- required: true
- type: string
- GERRIT_PATCHSET_REVISION:
- description: "The revision sha"
- required: true
- type: string
- GERRIT_PROJECT:
- description: "Project in Gerrit"
- required: true
- type: string
- GERRIT_REFSPEC:
- description: "Gerrit refspec of change"
- required: true
- type: string
-
-jobs:
- notify:
- runs-on: ubuntu-latest
- steps:
- - name: Notify job start
- # yamllint disable-line rule:line-length
- uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4
- with:
- host: ${{ vars.GERRIT_SERVER }}
- username: ${{ vars.GERRIT_SSH_USER }}
- key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
- known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
- gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
- gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
- vote-type: clear
- comment-only: true
- - name: Allow replication
- run: sleep 10s
-
- call-gerrit-rtdv3-merge:
- needs: notify
- # yamllint disable-line rule:line-length
- uses: lfit/releng-reusable-workflows/.github/workflows/compose-rtdv3-merge.yaml@main
- with:
- GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
- GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
- GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }}
- GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }}
- GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }}
- GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
- GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }}
- GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }}
- GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
- secrets:
- RTD_TOKEN: ${{ secrets.RTD_TOKEN }}
-
- report-status:
- if: ${{ always() }}
- needs: [notify, call-gerrit-rtdv3-merge]
- runs-on: ubuntu-latest
- steps:
- - name: Get workflow conclusion
- uses: technote-space/workflow-conclusion-action@v3
- - name: Report workflow conclusion
- # yamllint disable-line rule:line-length
- uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4
- with:
- host: ${{ vars.GERRIT_SERVER }}
- username: ${{ vars.GERRIT_SSH_USER }}
- key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
- known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
- gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
- gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
- vote-type: ${{ env.WORKFLOW_CONCLUSION }}
- comment-only: true
diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
deleted file mode 100644
index d425427..0000000
--- a/.github/workflows/gerrit-verify.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-name: Gerrit Composed rtdv3 Verify
-
-# yamllint disable-line rule:truthy
-on:
- workflow_dispatch:
- inputs:
- GERRIT_BRANCH:
- description: "Branch that change is against"
- required: true
- type: string
- GERRIT_CHANGE_ID:
- description: "The ID for the change"
- required: true
- type: string
- GERRIT_CHANGE_NUMBER:
- description: "The Gerrit number"
- required: true
- type: string
- GERRIT_CHANGE_URL:
- description: "URL to the change"
- required: true
- type: string
- GERRIT_EVENT_TYPE:
- description: "Type of Gerrit event"
- required: true
- type: string
- GERRIT_PATCHSET_NUMBER:
- description: "The patch number for the change"
- required: true
- type: string
- GERRIT_PATCHSET_REVISION:
- description: "The revision sha"
- required: true
- type: string
- GERRIT_PROJECT:
- description: "Project in Gerrit"
- required: true
- type: string
- GERRIT_REFSPEC:
- description: "Gerrit refspec of change"
- required: true
- type: string
-
-jobs:
- prepare:
- runs-on: ubuntu-latest
- steps:
- - name: Clear votes
- # yamllint disable-line rule:line-length
- uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4
- with:
- host: ${{ vars.GERRIT_SERVER }}
- username: ${{ vars.GERRIT_SSH_USER }}
- key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
- known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
- gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
- gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
- vote-type: clear
- comment-only: true
- - name: Allow replication
- run: sleep 10s
-
- rtd-validation:
- needs: prepare
- # use compose-jjb-verify from the v0.4 series of releng-reusable-workflows
- # yamllint disable-line rule:line-length
- uses: lfit/releng-reusable-workflows/.github/workflows/compose-rtdv3-verify.yaml@main
- with:
- GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
- GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
- GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }}
- GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }}
- GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }}
- GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
- GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }}
- GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }}
- GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
- secrets:
- RTD_TOKEN: ${{ secrets.RTD_TOKEN }}
-
- vote:
- if: ${{ always() }}
- # yamllint enable rule:line-length
- needs: [prepare, rtd-validation]
- runs-on: ubuntu-latest
- steps:
- - name: Get conclusion
- # yamllint disable-line rule:line-length
- uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # v3.0.3
- - name: Set vote
- # yamllint disable-line rule:line-length
- uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4
- with:
- host: ${{ vars.GERRIT_SERVER }}
- username: ${{ vars.GERRIT_SSH_USER }}
- key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
- known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
- gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
- gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
- vote-type: ${{ env.WORKFLOW_CONCLUSION }}
- comment-only: true
diff --git a/cps-ncmp-rest/docs/openapi/components.yaml b/cps-ncmp-rest/docs/openapi/components.yaml
index 818b2da..243de62 100644
--- a/cps-ncmp-rest/docs/openapi/components.yaml
+++ b/cps-ncmp-rest/docs/openapi/components.yaml
@@ -127,6 +127,9 @@
$ref: '#/components/schemas/RestCmHandleProperties'
publicCmHandleProperties:
$ref: '#/components/schemas/RestCmHandleProperties'
+ moduleSetTag:
+ type: string
+ example: "my-module-set-tag"
RestCmHandleProperties:
type: object
additionalProperties:
diff --git a/csit/tests/cps-data-operations/cps-data-operations.robot b/csit/tests/cps-data-operations/cps-data-operations.robot
index b2912ee..16eb5f2 100644
--- a/csit/tests/cps-data-operations/cps-data-operations.robot
+++ b/csit/tests/cps-data-operations/cps-data-operations.robot
@@ -58,17 +58,20 @@
${messages}= Poll group_id=${group_id} only_value=false
${event} Set Variable ${messages}[0]
${headers} Set Variable ${event.headers()}
- ${specVersionHeaderValue} Set Variable ${headers[1][1]}
- ${sourceHeaderValue} Set Variable ${headers[3][1]}
- ${typeHeaderValue} Set Variable ${headers[4][1]}
- ${correlationIdHeaderValue} Set Variable ${headers[8][1]}
- Should Be Equal As Strings ${specVersionHeaderValue} 1.0
- Should Be Equal As Strings ${sourceHeaderValue} DMI
- Should Be Equal As Strings ${correlationIdHeaderValue} ${expectedRequestId}
- Should Be Equal As Strings ${typeHeaderValue} org.onap.cps.ncmp.events.async1_0_0.DataOperationEvent
+ FOR ${header_key_value_pair} IN @{headers}
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_specversion" "1.0"
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_source" "DMI"
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_type" "org.onap.cps.ncmp.events.async1_0_0.DataOperationEvent"
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_correlationid" "${expectedRequestId}"
+ END
[Teardown] Basic Teardown ${group_id}
*** Keywords ***
+Compare Header Values
+ [Arguments] ${header_key} ${header_value} ${header_to_check} ${expected_header_value}
+ IF "${header_key}" == ${header_to_check}
+ Should Be Equal As Strings "${header_value}" ${expected_header_value}
+ END
Basic Teardown
[Arguments] ${group_id}
diff --git a/csit/tests/cps-subscriptions/cps-subscription-notification.robot b/csit/tests/cps-subscriptions/cps-subscription-notification.robot
index b0e8665..2d5152a 100644
--- a/csit/tests/cps-subscriptions/cps-subscription-notification.robot
+++ b/csit/tests/cps-subscriptions/cps-subscription-notification.robot
@@ -69,16 +69,20 @@
${result}= Poll group_id=${GROUP_ID} only_value=False
${headers} Set Variable ${result[0].headers()}
${value} Set Variable ${result[0].value()}
- ${valueAsDict}= Evaluate json.loads("""${value}""") json
- ${specVersionHeaderValue} Set Variable ${headers[1][1]}
- ${sourceHeaderValue} Set Variable ${headers[3][1]}
- ${typeHeaderValue} Set Variable ${headers[4][1]}
- ${correlationIdHeaderValue} Set Variable ${headers[6][1]}
+ ${valueAsDict}= Evaluate json.loads("""${value}""") json
+ FOR ${header_key_value_pair} IN @{headers}
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_specversion" "1.0"
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_source" "NCMP"
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_type" "subscriptionCreatedStatus"
+ Compare Header Values ${header_key_value_pair[0]} ${header_key_value_pair[1]} "ce_correlationid" "SCO-9989752cm-subscription-001"
+ END
Dictionaries Should Be Equal ${valueAsDict} ${ncmpOutEventJsonGlobal}
- Should Be Equal As Strings ${specVersionHeaderValue} 1.0
- Should Be Equal As Strings ${sourceHeaderValue} NCMP
- Should Be Equal As Strings ${typeHeaderValue} subscriptionCreatedStatus
- Should Be Equal As Strings ${correlationIdHeaderValue} SCO-9989752cm-subscription-001
+
+Compare Header Values
+ [Arguments] ${header_key} ${header_value} ${header_to_check} ${expected_header_value}
+ IF "${header_key}" == ${header_to_check}
+ Should Be Equal As Strings "${header_value}" ${expected_header_value}
+ END
Basic Teardown
[Arguments] ${group_id}