- updates to SFC yang files to reflect changed model
- Patch Set 2 : rebase
- Patch Set 3 : Fixed SFF config after manually testing
all the changed JSONs locally.
- Patch Set 4 : rebase
- Patch Set 5 : Fixed other erroneous SFC JSON files
Change-Id: Ibba9a310c159735c54c0952639d5370a13912000
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
"sfc-service-function": [
{
"name": "dpi-abstract1",
"sfc-service-function": [
{
"name": "dpi-abstract1",
- "type": "service-function-type:dpi",
"order" : 0
},
{
"name": "napt44-abstract1",
"order" : 0
},
{
"name": "napt44-abstract1",
- "type": "service-function-type:napt44",
"order" : 1
},
{
"name": "firewall-abstract1",
"order" : 1
},
{
"name": "firewall-abstract1",
- "type": "service-function-type:firewall",
"sfc-service-function": [
{
"name": "firewall-abstract2",
"sfc-service-function": [
{
"name": "firewall-abstract2",
- "type": "service-function-type:firewall",
"order" : 0
},
{
"name": "napt44-abstract2",
"order" : 0
},
{
"name": "napt44-abstract2",
- "type": "service-function-type:napt44",
-}
\ No newline at end of file
"service-function-dictionary": [
{
"sff-sf-data-plane-locator": {
"service-function-dictionary": [
{
"sff-sf-data-plane-locator": {
- "port": 5000,
- "ip": "10.1.1.1"
+ "sf-dpl-name": "SF1-DPL",
+ "sff-dpl-name": "eth0"
- "name": "SF1",
- "type": "service-function-type:dpi"
},
{
"sff-sf-data-plane-locator": {
},
{
"sff-sf-data-plane-locator": {
- "port": 5000,
- "ip": "10.1.1.2"
+ "sf-dpl-name": "SF2-DPL",
+ "sff-dpl-name": "eth0"
- "name": "SF2",
- "type": "service-function-type:firewall"
}
],
"connected-sff-dictionary": [
}
],
"connected-sff-dictionary": [
"service-function-dictionary": [
{
"sff-sf-data-plane-locator": {
"service-function-dictionary": [
{
"sff-sf-data-plane-locator": {
- "port": 5000,
- "ip": "10.1.1.5"
+ "sf-dpl-name": "SF5-DPL",
+ "sff-dpl-name": "eth0"
- "name": "SF5",
- "type": "service-function-type:dpi"
},
{
"sff-sf-data-plane-locator": {
},
{
"sff-sf-data-plane-locator": {
- "port": 5000,
- "ip": "10.1.1.6"
+ "sf-dpl-name": "SF6-DPL",
+ "sff-dpl-name": "eth0"
- "name": "SF6",
- "type": "service-function-type:napt44"
}
],
"connected-sff-dictionary": [
}
],
"connected-sff-dictionary": [
}
],
"name": "napt44-103-2",
}
],
"name": "napt44-103-2",
- "type": "service-function-type:napt44",
}
],
"name": "napt44-103-1",
}
],
"name": "napt44-103-1",
- "type": "service-function-type:napt44",
}
],
"name": "dpi-102-2",
}
],
"name": "dpi-102-2",
- "type": "service-function-type:dpi",
}
],
"name": "firewall-101-2",
}
],
"name": "firewall-101-2",
- "type": "service-function-type:firewall",
}
],
"name": "napt44-104",
}
],
"name": "napt44-104",
- "type": "service-function-type:napt44",
}
],
"name": "dpi-102-1",
}
],
"name": "dpi-102-1",
- "type": "service-function-type:dpi",
}
],
"name": "firewall-104",
}
],
"name": "firewall-104",
- "type": "service-function-type:firewall",
}
],
"name": "dpi-102-3",
}
],
"name": "dpi-102-3",
- "type": "service-function-type:dpi",
}
],
"name": "firewall-101-1",
}
],
"name": "firewall-101-1",
- "type": "service-function-type:firewall",
"service-function": [
{
"name": "dpi-102-100",
"service-function": [
{
"name": "dpi-102-100",
- "type": "service-function-type:dpi",
"nsh-aware": true,
"sf-data-plane-locator": [
{
"nsh-aware": true,
"sf-data-plane-locator": [
{
{
"name": "dpi-abstract100",
"order": 0,
{
"name": "dpi-abstract100",
"order": 0,
- "type": "service-function-type:firewall"
},
{
"name": "napt44-abstract100",
"order": 1,
},
{
"name": "napt44-abstract100",
"order": 1,
- "type": "service-function-type:dpi"
},
{
"name": "firewall-abstract100",
"order": 2,
},
{
"name": "firewall-abstract100",
"order": 2,
- "type": "service-function-type:napt44"
{
"name": "ids-abstract100",
"order": 3,
{
"name": "ids-abstract100",
"order": 3,
- "type": "service-function-type:ids"
"service-function-dictionary": [
{
"sff-sf-data-plane-locator": {
"service-function-dictionary": [
{
"sff-sf-data-plane-locator": {
- "port": 6000,
- "ip": "10.1.1.7"
+ "sf-dpl-name": "SF7-DPL",
+ "sff-dpl-name": "eth0"
- "name": "SF7",
- "type": "service-function-type:dpi"
{
"sff-sf-data-plane-locator": {
{
"sff-sf-data-plane-locator": {
- "ip": "10.1.1.1",
- "port": 6000
+ "sf-dpl-name": "SF2-DPL",
+ "sff-dpl-name": "eth0"
{
"name": "SF100",
"sff-sf-data-plane-locator": {
{
"name": "SF100",
"sff-sf-data-plane-locator": {
- "ip": "10.1.1.1",
- "port": 5100
- },
- "type": "service-function-type:napt44"
+ "sf-dpl-name": "SF2-DPL",
+ "sff-dpl-name": "eth0"
+ }