diff --git a/dataplane-in-a-box/tfs-01-topology.json b/dataplane-in-a-box/tfs-01-topology.json
index 73e1bc224591371f23fcebb8e45e806660916952..6362584ba846f3c33b08b9e619ac59623b46c7b7 100644
--- a/dataplane-in-a-box/tfs-01-topology.json
+++ b/dataplane-in-a-box/tfs-01-topology.json
@@ -7,41 +7,45 @@
     ],
     "devices": [
         {
-            "device_id": {"device_uuid": {"uuid": "dc1"}}, "device_type": "emu-datacenter", "device_drivers": [0],
+            "device_id": {"device_uuid": {"uuid": "dc1"}}, "device_type": "emu-datacenter",
+            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],
             "device_config": {"config_rules": [
-                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
                     {"uuid": "eth1", "type": "copper"}, {"uuid": "int", "type": "copper"}
                 ]}}}
             ]}
         },
         {
-            "device_id": {"device_uuid": {"uuid": "dc2"}}, "device_type": "emu-datacenter", "device_drivers": [0],
+            "device_id": {"device_uuid": {"uuid": "dc2"}}, "device_type": "emu-datacenter",
+            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],
             "device_config": {"config_rules": [
-                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
                     {"uuid": "eth1", "type": "copper"}, {"uuid": "int", "type": "copper"}
                 ]}}}
             ]}
         },
         {
-            "device_id": {"device_uuid": {"uuid": "r1"}}, "device_type": "packet-router", "device_drivers": [8],
+            "device_id": {"device_uuid": {"uuid": "r1"}}, "device_type": "packet-router",
+            "device_drivers": ["DEVICEDRIVER_GNMI_OPENCONFIG"],
             "device_config": {"config_rules": [
-                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.101"}},
-                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
-                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.101"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
                     "username": "admin", "password": "admin", "use_tls": false
                 }}}
             ]}
         },
         {
-            "device_id": {"device_uuid": {"uuid": "r2"}}, "device_type": "packet-router", "device_drivers": [8],
+            "device_id": {"device_uuid": {"uuid": "r2"}}, "device_type": "packet-router",
+            "device_drivers": ["DEVICEDRIVER_GNMI_OPENCONFIG"],
             "device_config": {"config_rules": [
-                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.102"}},
-                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
-                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.102"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
+                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
                     "username": "admin", "password": "admin", "use_tls": false
                 }}}
             ]}
diff --git a/dataplane-in-a-box/tfs-02-l3-service.json b/dataplane-in-a-box/tfs-02-l3-service.json
index 0e2dc5c6709edfb041242184a898a72b30841af8..59938e71edf0ca5b47baf136eeb5e36650a4f038 100644
--- a/dataplane-in-a-box/tfs-02-l3-service.json
+++ b/dataplane-in-a-box/tfs-02-l3-service.json
@@ -4,20 +4,22 @@
             "service_id": {
                 "context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "dc1-2-dc2-l3svc"}
             },
-            "service_type": 1,
-            "service_status": {"service_status": 1},
+            "service_type": "SERVICETYPE_L3NM",
+            "service_status": {"service_status": "SERVICESTATUS_PLANNED"},
             "service_endpoint_ids": [
                 {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "int"}},
                 {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "int"}}
             ],
             "service_constraints": [],
             "service_config": {"config_rules": [
-                {"action": 1, "custom": {"resource_key": "/device[dc1]/endpoint[eth1]/settings", "resource_value": {
-                    "ipv4_address": "192.168.1.10", "ipv4_prefix": 24, "sub_interface_index": 0
-                }}},
-                {"action": 1, "custom": {"resource_key": "/device[dc2]/endpoint[eth1]/settings", "resource_value": {
-                    "ipv4_address": "192.168.2.10", "ipv4_prefix": 24, "sub_interface_index": 0
-                }}}
+                {"action": "CONFIGACTION_SET", "custom": {
+                    "resource_key": "/device[dc1]/endpoint[eth1]/settings",
+                    "resource_value": {"ipv4_address": "192.168.1.10", "ipv4_prefix": 24, "sub_interface_index": 0}
+                }},
+                {"action": "CONFIGACTION_SET", "custom": {
+                    "resource_key": "/device[dc2]/endpoint[eth1]/settings",
+                    "resource_value": {"ipv4_address": "192.168.2.10", "ipv4_prefix": 24, "sub_interface_index": 0}
+                }}
             ]}
         }
     ]