From 5832ecdf3615b7c78fbe3cfe73cfd122a0a4a5a9 Mon Sep 17 00:00:00 2001
From: Serhiy Boiko <serhiy.boiko@plvision.eu>
Date: Thu, 4 Apr 2024 13:47:30 +0300
Subject: [PATCH] cfg: Align config samples with current schema definitions

Signed-off-by: Serhiy Boiko <serhiy.boiko@plvision.eu>
Change-Id: I7b4a2974d19ea645c7cfe7ab9ca1bde27a849f73
---
 config-samples/cfg6_dhcp.json          | 18 ++++++++++--
 config-samples/cfg7_ieee8021x.json     | 12 ++++++--
 config-samples/cfg_port_isolation.json | 38 ++++++++++++++------------
 config-samples/cfg_services_log.json   | 16 +++++------
 4 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/config-samples/cfg6_dhcp.json b/config-samples/cfg6_dhcp.json
index f5c754f..53f4b46 100644
--- a/config-samples/cfg6_dhcp.json
+++ b/config-samples/cfg6_dhcp.json
@@ -17,7 +17,11 @@
     {
       "ipv4": {
         "addressing": "static",
-        "subnet": "20.20.20.20/24",
+        "subnet": [
+          {
+            "prefix": "20.20.20.20/24"
+          }
+        ],
         "dhcp": {
           "relay-server": "172.20.254.8",
           "circuit-id-format": "{Name}:{VLAN-ID}"
@@ -44,7 +48,11 @@
     {
       "ipv4": {
         "addressing": "static",
-        "subnet": "30.30.30.30/24",
+        "subnet": [
+          {
+            "prefix": "30.30.30.30/24"
+          }
+        ],
         "dhcp": {
           "relay-server": "172.20.10.12",
           "circuit-id-format": "{Name}:{VLAN-ID}"
@@ -71,7 +79,11 @@
     {
       "ipv4": {
         "addressing": "static",
-        "subnet": "172.20.10.181/24"
+        "subnet": [
+          {
+            "prefix": "172.20.10.181/24"
+          }
+        ]
       },
       "vlan": {
         "id": 20,
diff --git a/config-samples/cfg7_ieee8021x.json b/config-samples/cfg7_ieee8021x.json
index e4c6398..ad91d9e 100644
--- a/config-samples/cfg7_ieee8021x.json
+++ b/config-samples/cfg7_ieee8021x.json
@@ -50,7 +50,11 @@
       },
       "ipv4": {
         "addressing": "static",
-        "subnet": "10.10.20.100/24"
+        "subnet": [
+          {
+            "prefix": "10.10.20.100/24"
+          }
+        ]
       },
       "ethernet": [
         {
@@ -70,7 +74,11 @@
       },
       "ipv4": {
         "addressing": "static",
-        "subnet": "10.10.50.100/24"
+        "subnet": [
+          {
+            "prefix": "10.10.50.100/24"
+          }
+        ]
       },
       "ethernet": [
         {
diff --git a/config-samples/cfg_port_isolation.json b/config-samples/cfg_port_isolation.json
index 10e339e..7682069 100644
--- a/config-samples/cfg_port_isolation.json
+++ b/config-samples/cfg_port_isolation.json
@@ -1,24 +1,6 @@
 {
   "ethernet": [
     {
-      "port-isolation": {
-        "sessions": [
-          {
-            "id": 1,
-            "uplink": {
-              "interface-list": [
-                "Ethernet1"
-              ]
-            },
-            "downlink": {
-              "interface-list": [
-                "Ethernet2",
-                "Ethernet3"
-              ]
-            }
-          }
-        ]
-      },
       "select-ports": [
         "Ethernet*"
       ],
@@ -48,5 +30,25 @@
       "name": "mgmt-vlan"
     }
   ],
+  "switch": {
+    "port-isolation": {
+      "sessions": [
+        {
+          "id": 1,
+          "uplink": {
+            "interface-list": [
+              "Ethernet1"
+            ]
+          },
+          "downlink": {
+            "interface-list": [
+              "Ethernet2",
+              "Ethernet3"
+            ]
+          }
+        }
+      ]
+    }
+  },
   "uuid": 1
 }
diff --git a/config-samples/cfg_services_log.json b/config-samples/cfg_services_log.json
index 23eca85..02a98a3 100644
--- a/config-samples/cfg_services_log.json
+++ b/config-samples/cfg_services_log.json
@@ -31,15 +31,13 @@
     }
   ],
   "services": {
-    "log": [
-      {
-        "port": 2000,
-        "priority": 7,
-        "size": 1000,
-        "host": "192.168.1.10",
-        "proto": "udp"
-      }
-    ]
+    "log": {
+      "port": 2000,
+      "priority": 7,
+      "size": 1000,
+      "host": "192.168.1.10",
+      "proto": "udp"
+    }
   },
   "uuid": 1
 }