Expand field/action conversion scope of ofagent
Ofagent did not parse all fields back from protobuf to lexi,
hence ONOS was not able to confirm downloaded flows. This
made her unhappy.
Also, DHCP config info is added to ONOS netcfg.json.
Change-Id: I57ac5d3b4d14c8c52feb52e08bb420c15809238e
diff --git a/docker/config/netcfg.json b/docker/config/netcfg.json
index 265b15e..9e399e8 100644
--- a/docker/config/netcfg.json
+++ b/docker/config/netcfg.json
@@ -1,22 +1,40 @@
{
- "apps" : {
- "org.onosproject.aaa" : {
- "AAA" : {
- "radiusIp": "172.25.0.100",
- "radiusServerPort": "1812",
- "radiusSecret": "SECRET"
- }
- }
+ "apps": {
+ "org.onosproject.aaa": {
+ "AAA": {
+ "radiusIp": "172.25.0.100",
+ "radiusServerPort": "1812",
+ "radiusSecret": "SECRET"
+ }
},
- "devices" : {
- "of:0000000000000001" : {
- "basic" : {
- "driver" : "pmc-olt"
- },
- "accessDevice": {
- "uplink": "0",
- "vlan": "1000"
- }
- }
+ "org.onosproject.dhcp": {
+ "dhcp": {
+ "ip": "10.1.11.50",
+ "mac": "ca:fe:ca:fe:ca:fe",
+ "subnet": "255.255.252.0",
+ "broadcast": "10.1.11.255",
+ "router": "10.1.8.1",
+ "domain": "8.8.8.8",
+ "ttl": "63",
+ "lease": "300",
+ "renew": "150",
+ "rebind": "200",
+ "delay": "2",
+ "timeout": "150",
+ "startip": "10.1.11.51",
+ "endip": "10.1.11.100"
+ }
}
+ },
+ "devices": {
+ "of:0000000000000001": {
+ "basic": {
+ "driver": "pmc-olt"
+ },
+ "accessDevice": {
+ "uplink": "0",
+ "vlan": "1000"
+ }
+ }
+ }
}