aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hague <shague@redhat.com>2016-01-29 17:01:58 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-29 17:01:58 +0000
commit8bfc5379afb2094311ae4480794641ef6d05d361 (patch)
tree817c9fc91f1cb87c1a5d96b306411bd4c77285ce
parent09c96f2ff79fb4568b21cc33a010756b6cc4b78b (diff)
parent13af59872b888cfa88e1e7ca6e06e9e47341870c (diff)
Merge "Updating VnfMgr ODL SFC config" into stable/brahmaputra
-rwxr-xr-xvnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json6
-rwxr-xr-xvnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json4
2 files changed, 4 insertions, 6 deletions
diff --git a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json
index 191fd540..7809f1c2 100755
--- a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json
+++ b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFFs-HttpPut.json
@@ -33,10 +33,8 @@
"name": "firewall-2",
"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.11"
+ "sf-dpl-name": "firewall-2-dp1",
+ "sff-dpl-name": "sff2-dp1"
}
},
{
diff --git a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json
index 1ea27e79..391394f3 100755
--- a/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json
+++ b/vnfmgr/vnfmgr_odl/sample_config/RestConf-SFs-HttpPut.json
@@ -15,7 +15,7 @@
"rest-uri": "http://192.168.1.11:5000",
"nsh-aware": true,
"ip-mgmt-address": "192.168.1.11",
- "type": "service-function-type:firewall"
+ "type": "firewall"
},
{
"name": "firewall-3",
@@ -31,7 +31,7 @@
"rest-uri": "http://192.168.1.12:5000",
"nsh-aware": true,
"ip-mgmt-address": "192.168.1.12",
- "type": "service-function-type:firewall"
+ "type": "firewall"
}
]
}