summaryrefslogtreecommitdiffstats
path: root/platform-logic/restapi-templates/src
diff options
context:
space:
mode:
authorHesam Rahimi <hesam.rahimi@huawei.com>2022-09-12 11:44:00 -0400
committerHesam Rahimi <hesam.rahimi@huawei.com>2022-09-12 11:45:44 -0400
commit2360082ba553bc6cac39e7f7e6951d20a72e9582 (patch)
treed46dd91b1da6fa683f1eb22379875b8736ccc74c /platform-logic/restapi-templates/src
parentf7dc9e97793e5a7a57d198f1d0419a1b8d345a35 (diff)
Some bug fixing for E-Line based Cloud Leased-Line service support in CCVPN use-case.
Issue-ID: SDNC-1732 Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com> Change-Id: I60ed754abd080879af1908680f7d6862460ef0a0 Former-commit-id: 7de23e988c7cf73972e07eaf2186728fb47ef756
Diffstat (limited to 'platform-logic/restapi-templates/src')
-rw-r--r--platform-logic/restapi-templates/src/main/json/p2p-call-ves.json34
-rw-r--r--platform-logic/restapi-templates/src/main/json/p2p-create-pm-data.json22
-rw-r--r--platform-logic/restapi-templates/src/main/json/p2p-ethernet-service.json44
-rw-r--r--platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-domainG.json72
-rw-r--r--platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-dst-domain.json72
-rw-r--r--platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-src-domain.json16
-rw-r--r--platform-logic/restapi-templates/src/main/json/p2p-subscribe-notification.json23
7 files changed, 165 insertions, 118 deletions
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-call-ves.json b/platform-logic/restapi-templates/src/main/json/p2p-call-ves.json
new file mode 100644
index 00000000..ac502c65
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/p2p-call-ves.json
@@ -0,0 +1,34 @@
+{
+ "event": {
+ "commonEventHeader": {
+ "version": "4.0.1",
+ "vesEventListenerVersion": "7.0.1",
+ "domain": "notification",
+ "eventName": "ccvpnNotification_CloudLeaseLine_BandwidthChanged",
+ "eventId": ${eventIdUuid},
+ "lastEpochMicrosec": 8745745764578,
+ "priority": "Normal",
+ "reportingEntityName": "onap-sdnc",
+ "sequence": 0,
+ "sourceName": "onap-sdnc",
+ "startEpochMicrosec": 8745745764578,
+ "timeZoneOffset": "UTC-05.00"
+ },
+ "notificationFields": {
+ "changeIdentifier": "PM_BW_UPDATE",
+ "changeType": "BandwidthChanged",
+ "notificationFieldsVersion": "2.0",
+ "arrayOfNamedHashMap": [
+ {
+ "name": ${eventNameUuid},
+ "hashMap": {
+ "cllId": ${cclId},
+ "uniId": ${uniId},
+ "bandwidthValue": ${bandwidthValue},
+ "time": "2022-02-08T11:13:34.781-05:00"
+ }
+ }
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-create-pm-data.json b/platform-logic/restapi-templates/src/main/json/p2p-create-pm-data.json
index 101e9b9d..5d5f30f8 100644
--- a/platform-logic/restapi-templates/src/main/json/p2p-create-pm-data.json
+++ b/platform-logic/restapi-templates/src/main/json/p2p-create-pm-data.json
@@ -3,15 +3,27 @@
"service-pm": [
{
"service-name": ${eth-service-name},
- "task-pm-enable": true,
- "granularity": "ietf-service-pm:granularity-1min",
"performance-data-config": [
{
- "parameter-name": "ietf-service-pm:ingress-bandwidth",
- "measure-method": "ietf-service-pm:measure-at-ingress"
+ "parameter-name": "one-way-delay"
+ },
+ {
+ "parameter-name": "packet_loss_rate"
+ },
+ {
+ "parameter-name": "transmit-packets"
+ },
+ {
+ "parameter-name": "receive-packets"
+ },
+ {
+ "parameter-name": "delay_jitter"
+ },
+ {
+ "parameter-name": "two-way-delay"
}
]
}
]
}
-}
+} \ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-ethernet-service.json b/platform-logic/restapi-templates/src/main/json/p2p-ethernet-service.json
index 96052f88..6475b10e 100644
--- a/platform-logic/restapi-templates/src/main/json/p2p-ethernet-service.json
+++ b/platform-logic/restapi-templates/src/main/json/p2p-ethernet-service.json
@@ -1,18 +1,18 @@
{
"ietf-eth-tran-service:etht-svc-instances": [
{
- "etht-svc-name": "8f91fa46-e638-4ce7-8736-87abee900002",
+ "etht-svc-name": ${eth-service-name},
"etht-svc-title": "actn-eoo-00044",
"etht-svc-type": "ietf-eth-tran-types:p2p-svc",
"te-topology-identifier": {
- "provider-id": 5555,
- "client-id": 6666,
- "topology-id": "33"
+ "provider-id": ${provider-id},
+ "client-id": ${client-id},
+ "topology-id": ${topology-id}
},
"underlay": {
"otn-tunnels": [
{
- "name": "9f91fa46-e638-4ce7-8736-87abee900001",
+ "name": ${otn-tunnel-name},
"encoding": "ietf-te-types:lsp-encoding-oduk",
"switching-type": "ietf-te-types:switching-otn"
}
@@ -29,43 +29,23 @@
"admin-status": "ietf-te-types:tunnel-admin-state-up",
"etht-svc-end-points": [
{
- "etht-svc-end-point-name": "0",
+ "etht-svc-end-point-name": ${ethernet-end-point-name},
"etht-svc-access-points": [
{
- "access-point-id": "0",
- "access-node-id": "0.181.0.62",
- "access-ltp-id": 218038274
+ "access-point-id": ${index-number},
+ "access-node-id": ${eth-node-id},
+ "access-ltp-id": ${eth-node-tp-id}
}
],
"service-classification-type": "ietf-eth-tran-types:vlan-classification",
"outer-tag": {
"tag-type": "ietf-eth-tran-types:classify-c-vlan",
- "vlan-value": 1029
+ "vlan-value": ${cvlan}
},
"ingress-egress-bandwidth-profile": {
"bandwidth-profile-type": "ietf-eth-tran-types:mef-10-bwp",
- "CIR": 1000,
- "EIR": 0
- }
- },
- {
- "etht-svc-end-point-name": "1",
- "etht-svc-access-points": [
- {
- "access-point-id": "0",
- "access-node-id": "0.181.0.61",
- "access-ltp-id": 218038274
- }
- ],
- "service-classification-type": "ietf-eth-tran-types:vlan-classification",
- "outer-tag": {
- "tag-type": "ietf-eth-tran-types:classify-c-vlan",
- "vlan-value": 1029
- },
- "ingress-egress-bandwidth-profile": {
- "bandwidth-profile-type": "ietf-eth-tran-types:mef-10-bwp",
- "CIR": 1000,
- "EIR": 0
+ "CIR": ${CIR},
+ "EIR": ${EIR}
}
}
]
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-domainG.json b/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-domainG.json
index 3724158b..74e6d898 100644
--- a/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-domainG.json
+++ b/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-domainG.json
@@ -1,43 +1,43 @@
{
"ietf-te:tunnel": [
{
- "source": "0.181.0.62",
- "destination": "0.181.0.61",
- "encoding": "ietf-te-types:lsp-encoding-oduk",
- "name": "9f91fa46-e638-4ce7-8736-87abee900001",
- "restoration": {
- "enable": "false",
- "restoration-reversion-disable": "true",
- "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
- "wait-to-revert": 0
- },
- "te-bandwidth": {
- "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
- },
- "switching-type": "ietf-te-types:switching-otn",
- "te-topology-identifier": {
- "client-id": 6666,
- "provider-id": 5555,
- "topology-id": "11"
- },
- "p2p-primary-paths": {
- "p2p-primary-path": [
- {
- "name": "primary-path",
- "optimizations": {
- "optimization-metric": [
- {
- "metric-type": "ietf-te-types:path-metric-te",
- "weight": "1"
- }
- ]
- }
+ "source": ${src-node-id},
+ "destination": ${dst-node-id},
+ "encoding": "ietf-te-types:lsp-encoding-oduk",
+ "name": ${otn-tunnel-name-src-domain},
+ "restoration": {
+ "enable": "false",
+ "restoration-reversion-disable": "true",
+ "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
+ "wait-to-revert": 0
+ },
+ "te-bandwidth": {
+ "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
+ },
+ "switching-type": "ietf-te-types:switching-otn",
+ "te-topology-identifier": {
+ "client-id": ${client-id},
+ "provider-id": ${provider-id},
+ "topology-id": ${topology-id}
+ },
+ "p2p-primary-paths": {
+ "p2p-primary-path": [
+ {
+ "name": "primary-path",
+ "optimizations": {
+ "optimization-metric": [
+ {
+ "metric-type": "ietf-te-types:path-metric-te",
+ "weight": "1"
+ }
+ ]
}
- ]
- },
- "ietf-otn-tunnel:dst-tributary-slot-count": 0,
- "ietf-otn-tunnel:src-tributary-slot-count": 0,
- "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
+ }
+ ]
+ },
+ "ietf-otn-tunnel:dst-tributary-slot-count": ${gfp-n},
+ "ietf-otn-tunnel:src-tributary-slot-count": ${gfp-n},
+ "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
}
]
} \ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-dst-domain.json b/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-dst-domain.json
index 3724158b..74e6d898 100644
--- a/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-dst-domain.json
+++ b/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-dst-domain.json
@@ -1,43 +1,43 @@
{
"ietf-te:tunnel": [
{
- "source": "0.181.0.62",
- "destination": "0.181.0.61",
- "encoding": "ietf-te-types:lsp-encoding-oduk",
- "name": "9f91fa46-e638-4ce7-8736-87abee900001",
- "restoration": {
- "enable": "false",
- "restoration-reversion-disable": "true",
- "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
- "wait-to-revert": 0
- },
- "te-bandwidth": {
- "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
- },
- "switching-type": "ietf-te-types:switching-otn",
- "te-topology-identifier": {
- "client-id": 6666,
- "provider-id": 5555,
- "topology-id": "11"
- },
- "p2p-primary-paths": {
- "p2p-primary-path": [
- {
- "name": "primary-path",
- "optimizations": {
- "optimization-metric": [
- {
- "metric-type": "ietf-te-types:path-metric-te",
- "weight": "1"
- }
- ]
- }
+ "source": ${src-node-id},
+ "destination": ${dst-node-id},
+ "encoding": "ietf-te-types:lsp-encoding-oduk",
+ "name": ${otn-tunnel-name-src-domain},
+ "restoration": {
+ "enable": "false",
+ "restoration-reversion-disable": "true",
+ "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
+ "wait-to-revert": 0
+ },
+ "te-bandwidth": {
+ "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
+ },
+ "switching-type": "ietf-te-types:switching-otn",
+ "te-topology-identifier": {
+ "client-id": ${client-id},
+ "provider-id": ${provider-id},
+ "topology-id": ${topology-id}
+ },
+ "p2p-primary-paths": {
+ "p2p-primary-path": [
+ {
+ "name": "primary-path",
+ "optimizations": {
+ "optimization-metric": [
+ {
+ "metric-type": "ietf-te-types:path-metric-te",
+ "weight": "1"
+ }
+ ]
}
- ]
- },
- "ietf-otn-tunnel:dst-tributary-slot-count": 0,
- "ietf-otn-tunnel:src-tributary-slot-count": 0,
- "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
+ }
+ ]
+ },
+ "ietf-otn-tunnel:dst-tributary-slot-count": ${gfp-n},
+ "ietf-otn-tunnel:src-tributary-slot-count": ${gfp-n},
+ "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
}
]
} \ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-src-domain.json b/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-src-domain.json
index 3724158b..e9d7cba8 100644
--- a/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-src-domain.json
+++ b/platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-src-domain.json
@@ -1,10 +1,10 @@
{
"ietf-te:tunnel": [
{
- "source": "0.181.0.62",
- "destination": "0.181.0.61",
+ "source": ${src-node-id},
+ "destination": ${dst-node-id},
"encoding": "ietf-te-types:lsp-encoding-oduk",
- "name": "9f91fa46-e638-4ce7-8736-87abee900001",
+ "name": ${otn-tunnel-name-src-domain},
"restoration": {
"enable": "false",
"restoration-reversion-disable": "true",
@@ -16,9 +16,9 @@
},
"switching-type": "ietf-te-types:switching-otn",
"te-topology-identifier": {
- "client-id": 6666,
- "provider-id": 5555,
- "topology-id": "11"
+ "client-id": ${client-id},
+ "provider-id": ${provider-id},
+ "topology-id": ${topology-id}
},
"p2p-primary-paths": {
"p2p-primary-path": [
@@ -35,8 +35,8 @@
}
]
},
- "ietf-otn-tunnel:dst-tributary-slot-count": 0,
- "ietf-otn-tunnel:src-tributary-slot-count": 0,
+ "ietf-otn-tunnel:dst-tributary-slot-count": ${gfp-n},
+ "ietf-otn-tunnel:src-tributary-slot-count": ${gfp-n},
"provisioning-state": "ietf-te-types:tunnel-admin-state-down"
}
]
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-subscribe-notification.json b/platform-logic/restapi-templates/src/main/json/p2p-subscribe-notification.json
index 02fd8a54..b6ea94bc 100644
--- a/platform-logic/restapi-templates/src/main/json/p2p-subscribe-notification.json
+++ b/platform-logic/restapi-templates/src/main/json/p2p-subscribe-notification.json
@@ -1 +1,22 @@
-{ "ietf-subscribed-notifications:input": { "encoding": "encode-json" } } \ No newline at end of file
+{
+ "ietf-eth-service-oam:input": {
+ "oam-config-list": [
+ {
+ "service-name": ${eth-service-name},
+ "source": {
+ "meg-id": "12345678",
+ "meg-level": 4,
+ "mep-id": 3,
+ "remote-mep-id": 4
+ },
+ "destination": {
+ "meg-id": "12345678",
+ "meg-level": 4,
+ "mep-id": 4,
+ "remote-mep-id": 3
+ },
+ "cc-interval": "interval-1s"
+ }
+ ]
+ }
+} \ No newline at end of file