From 51b51dbfb1467468587b534118da2a22048cb4c9 Mon Sep 17 00:00:00 2001 From: Brady Johnson Date: Mon, 12 Jun 2017 11:10:25 +0200 Subject: Updating VNF Manager ODL config to comply with Carbon - There were some configurations that were using older deprecated models that have since been removed. Change-Id: I66b60b510c5afcfb6c6a9c4380aff0b88c9187a9 Signed-off-by: Brady Johnson --- .../sample_config/RestConf-SFFs-HttpPut.json | 32 +++++++--------------- 1 file changed, 10 insertions(+), 22 deletions(-) (limited to 'vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json') diff --git a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json index 7809f1c2..85513e9e 100755 --- a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json +++ b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json @@ -3,53 +3,41 @@ "service-function-forwarder": [ { "name": "SFF2", + "service-function-forwarder-ovs:ovs-bridge": { + "bridge-name": "br-int" + }, "sff-data-plane-locator": [ { "name": "sff2-dp1", - "service-function-forwarder-ovs:ovs-bridge": {}, "data-plane-locator": { "transport": "service-locator:vxlan-gpe", "port": 6633, - "ip": "192.168.1.100" + "ip": "159.107.45.19" }, "service-function-forwarder-ovs:ovs-options": { - "nshc1": "flow", - "nsp": "flow", "key": "flow", "remote-ip": "flow", - "nsi": "flow", - "nshc2": "flow", - "nshc3": "flow", "dst-port": "6633", - "nshc4": "flow" + "exts": "gpe" } } ], - "service-function-forwarder-ovs:ovs-bridge": { - "bridge-name": "ovs-br2" - }, "service-function-dictionary": [ { "name": "firewall-2", - "type": "service-function-type:firewall", "sff-sf-data-plane-locator": { "sf-dpl-name": "firewall-2-dp1", "sff-dpl-name": "sff2-dp1" } }, - { + { "name": "firewall-3", - "type": "service-function-type:firewall", "sff-sf-data-plane-locator": { - "service-function-forwarder-ovs:ovs-bridge": {}, - "transport": "service-locator:vxlan-gpe", - "port": 6633, - "ip": "192.168.1.12" + "sf-dpl-name": "firewall-3-dp1", + "sff-dpl-name": "sff2-dp1" } } - ], - "ip-mgmt-address": "192.168.1.100", - "service-node": "" + ] }, { "name": "SFF-CL", @@ -60,7 +48,7 @@ "data-plane-locator": { "transport": "service-locator:vxlan-gpe", "port": 30001, - "ip": "192.168.1.50" + "ip": "159.107.45.19" } } ], -- cgit 1.2.3-korg