diff options
| author |   Brady Johnson <brady.allen.johnson@ericsson.com> | 2017-06-12 11:10:25 +0200 |
|---|---|---|
| committer | Brady Johnson <brady.allen.johnson@ericsson.com> | 2017-06-12 11:10:25 +0200 |
| commit | 51b51dbfb1467468587b534118da2a22048cb4c9 (patch) | |
| tree | fd228efee3335361abb40a9363394cf78144babb /vnfmgr | |
| parent | a29f1fcf91f130f74dbd9d7c83bb7445faec6136 (diff) | |
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 <brady.allen.johnson@ericsson.com>
Diffstat (limited to 'vnfmgr')
4 files changed, 13 insertions, 29 deletions
diff --git a/vnfmgr/vnfmgr_odl/sample_config/RestConf-RSP-HttpPost.json b/vnfmgr/vnfmgr_odl/sample_config/RestConf-RSP-HttpPost.json index 998d1e07..c0085eae 100755 --- a/vnfmgr/vnfmgr_odl/sample_config/RestConf-RSP-HttpPost.json +++ b/vnfmgr/vnfmgr_odl/sample_config/RestConf-RSP-HttpPost.json @@ -1,7 +1,6 @@ { "input": { "name": "sfc-path-1", - "parent-service-function-path": "sfc-path-1", - "symmetric": true + "parent-service-function-path": "sfc-path-1" } } diff --git a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFCs-HttpPut.json b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFCs-HttpPut.json index 34449647..4728a669 100755 --- a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFCs-HttpPut.json +++ b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFCs-HttpPut.json @@ -3,15 +3,14 @@ "service-function-chain": [ { "name": "sfc-chain-1", - "symmetric": true, "sfc-service-function": [ { "name": "firewall-abstract1", - "type": "service-function-type:firewall" + "type": "firewall" }, { "name": "firewall-abstract2", - "type": "service-function-type:firewall" + "type": "firewall" } ] } 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" } } ], diff --git a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json index 391394f3..9616d8bc 100755 --- a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json +++ b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json @@ -13,7 +13,6 @@ } ], "rest-uri": "http://192.168.1.11:5000", - "nsh-aware": true, "ip-mgmt-address": "192.168.1.11", "type": "firewall" }, @@ -29,7 +28,6 @@ } ], "rest-uri": "http://192.168.1.12:5000", - "nsh-aware": true, "ip-mgmt-address": "192.168.1.12", "type": "firewall" } |