From 0eaaa3f30ccca15838262491a32d67d32bce8e09 Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Fri, 3 Nov 2017 14:28:53 -0700 Subject: Update brg activate and tunnelxconn create DGs This update adds RestApiCallNode calls to tunnelxconn create DG to configure xconnect for vCPE VNFs and fixes order of vxlan tunnel create on brg activate DG and tunnelxconn create DG. It also converts tabs to spaces in brg-allotted-resource.json and tunnelxconn-allotted-resource.json. Issue-Id: SDNC-164 Change-Id: I72c70762df7f778ab9a8aca2040f5c424eb4dc0d Signed-off-by: Marcus G K Williams Former-commit-id: 90aab828a230896fa60398c3f66f6fee57c73be5 --- .../src/main/properties/generic-resource-api-dg.properties | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'installation/src/main/properties') diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties index c0631327..cc56c984 100644 --- a/installation/src/main/properties/generic-resource-api-dg.properties +++ b/installation/src/main/properties/generic-resource-api-dg.properties @@ -10,8 +10,9 @@ honeycomb.password=admin restapi.sz.templatefile=security-zone-allotted-resource.json restapi.cr.templatefile=contrail-route-allotted-resource.json restapi.brg.templatefile=brg-allotted-resource.json -restapi.brg.vxlan-tunnel.templatefile=vcpe-vxlan-tunnel.json -restapi.brg.vpp-bridge-domain.templatefile=vcpe-vpp-bridge-domain.json +restapi.vpp.vxlan-tunnel.templatefile=vcpe-vxlan-tunnel.json +restapi.vpp.bridge-domain.templatefile=vcpe-vpp-bridge-domain.json +restapi.vpp.xconnect.templatefile=vcpe-l2-interface.json restapi.tx.templatefile=tx-allotted-resource.json restapi.parentsvc.templatefile=parent-provided-allotted-resource.json restapi.network-ar.templatefile=network-provided-allotted-resources.json @@ -20,7 +21,7 @@ restapi.vnf-ar.templatefile=vnf-provided-allotted-resources.json restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/ restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/ restapi.brg-allottedresource=/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/ -restapi.brg-vpp-honeycomb=/restconf/config/ietf-interfaces:interfaces/interface/{tunnel-name} +restapi.vpp-honeycomb=/restconf/config/ietf-interfaces:interfaces/interface/{tunnel-name} restapi.tx-allottedresource=/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/ restapi.vnf-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/ restapi.network-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/ -- cgit 1.2.3-korg