Merge e179c81 into e7d9824

onosproject · May 30, 2019 · 3e473f2 · 3e473f2
2 parents e7d9824 + e179c81
commit 3e473f2
Show file tree

Hide file tree

Showing 6 changed files with 310 additions and 16 deletions.
diff --git a/configs/changeStore-sample.json b/configs/changeStore-sample.json
@@ -124,7 +124,7 @@
       "ID": "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
       "Description": "Original configuration for devicesim",
       "Created": "2019-05-21T08:43:01Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-interfaces:interfaces/interface[name=admin]/config/name",
           "Value": "admin"
@@ -211,7 +211,7 @@
       "ID": "i86kLjjNFr5IBa+O3YTuv9HBqJg=",
       "Description": "Modification of device sim 1",
       "Created": "2019-05-21T08:43:02Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-system:system/config/hostname",
           "Value": "localhost:10161"
@@ -226,7 +226,7 @@
       "ID": "UyPwBSOxDqQM/ZCohHFannSF5ME=",
       "Description": "Modification of device sim 2",
       "Created": "2019-05-21T08:43:03Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-system:system/config/hostname",
           "Value": "localhost:10162"
@@ -241,7 +241,7 @@
       "ID": "5FTJ5QDC0y/RoFnJPfdh8NsB+4Y=",
       "Description": "Modification of device sim 3",
       "Created": "2019-05-21T08:43:04Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-system:system/config/hostname",
           "Value": "localhost:10163"
@@ -251,6 +251,51 @@
           "Value": "Welcome to gNMI service on localhost:10163"
         }
       ]
+    },
+    "ZOBFNpGhCHoc9gLiJduqY1FiTzs=": {
+      "ID": "ZOBFNpGhCHoc9gLiJduqY1FiTzs=",
+      "Description": "Modification of device-1-device-simulator",
+      "Created": "2019-05-30T18:03:17Z",
+      "Config": [
+        {
+          "Path": "/openconfig-system:system/config/hostname",
+          "Value": "device-1-device-simulator"
+        },
+        {
+          "Path": "/openconfig-system:system/config/motd-banner",
+          "Value": "Welcome to gNMI service on device-1-device-simulator"
+        }
+      ]
+    },
+    "ZYNxDoardxYaQwMtbFbf1qO9AjE=": {
+      "ID": "ZYNxDoardxYaQwMtbFbf1qO9AjE=",
+      "Description": "Modification of device-2-device-simulator",
+      "Created": "2019-05-30T18:03:17Z",
+      "Config": [
+        {
+          "Path": "/openconfig-system:system/config/hostname",
+          "Value": "device-2-device-simulator"
+        },
+        {
+          "Path": "/openconfig-system:system/config/motd-banner",
+          "Value": "Welcome to gNMI service on device-2-device-simulator"
+        }
+      ]
+    },
+    "pLAjo6M3icVnLsZ8ZOjSaELH8SQ=": {
+      "ID": "pLAjo6M3icVnLsZ8ZOjSaELH8SQ=",
+      "Description": "Modification of device-3-device-simulator",
+      "Created": "2019-05-30T18:03:17Z",
+      "Config": [
+        {
+          "Path": "/openconfig-system:system/config/hostname",
+          "Value": "device-3-device-simulator"
+        },
+        {
+          "Path": "/openconfig-system:system/config/motd-banner",
+          "Value": "Welcome to gNMI service on device-3-device-simulator"
+        }
+      ]
     }
   }
 }
diff --git a/configs/configStore-sample.json b/configs/configStore-sample.json
@@ -161,6 +161,108 @@
           "Organisation": "OpenConfig working group"
         }
       ]
+    },
+    "device-1-device-simulator-1.0.0": {
+      "Name": "device-1-device-simulator-1.0.0",
+      "Device": "device-1-device-simulator",
+      "Version": "1.0.0",
+      "Type": "Devicesim",
+      "Created": "2019-05-30T18:03:17Z",
+      "Updated": "2019-05-30T18:03:17Z",
+      "Changes": [
+        "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
+        "ZOBFNpGhCHoc9gLiJduqY1FiTzs="
+      ],
+      "Models": [
+        {
+          "Name": "openconfig-interfaces",
+          "Version": "2.0.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-openflow",
+          "Version": "0.1.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-platform",
+          "Version": "0.5.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-system",
+          "Version": "0.2.0",
+          "Organisation": "OpenConfig working group"
+        }
+      ]
+    },
+    "device-2-device-simulator-1.0.0": {
+      "Name": "device-2-device-simulator-1.0.0",
+      "Device": "device-2-device-simulator",
+      "Version": "1.0.0",
+      "Type": "Devicesim",
+      "Created": "2019-05-30T18:03:17Z",
+      "Updated": "2019-05-30T18:03:17Z",
+      "Changes": [
+        "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
+        "ZYNxDoardxYaQwMtbFbf1qO9AjE="
+      ],
+      "Models": [
+        {
+          "Name": "openconfig-interfaces",
+          "Version": "2.0.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-openflow",
+          "Version": "0.1.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-platform",
+          "Version": "0.5.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-system",
+          "Version": "0.2.0",
+          "Organisation": "OpenConfig working group"
+        }
+      ]
+    },
+    "device-3-device-simulator-1.0.0": {
+      "Name": "device-3-device-simulator-1.0.0",
+      "Device": "device-3-device-simulator",
+      "Version": "1.0.0",
+      "Type": "Devicesim",
+      "Created": "2019-05-30T18:03:17Z",
+      "Updated": "2019-05-30T18:03:17Z",
+      "Changes": [
+        "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
+        "pLAjo6M3icVnLsZ8ZOjSaELH8SQ="
+      ],
+      "Models": [
+        {
+          "Name": "openconfig-interfaces",
+          "Version": "2.0.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-openflow",
+          "Version": "0.1.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-platform",
+          "Version": "0.5.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-system",
+          "Version": "0.2.0",
+          "Organisation": "OpenConfig working group"
+        }
+      ]
     }
   }
 }
diff --git a/deployments/helm/onos-config/files/configs/changeStore-sample.json b/deployments/helm/onos-config/files/configs/changeStore-sample.json
@@ -124,7 +124,7 @@
       "ID": "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
       "Description": "Original configuration for devicesim",
       "Created": "2019-05-21T08:43:01Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-interfaces:interfaces/interface[name=admin]/config/name",
           "Value": "admin"
@@ -211,7 +211,7 @@
       "ID": "i86kLjjNFr5IBa+O3YTuv9HBqJg=",
       "Description": "Modification of device sim 1",
       "Created": "2019-05-21T08:43:02Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-system:system/config/hostname",
           "Value": "localhost:10161"
@@ -226,7 +226,7 @@
       "ID": "UyPwBSOxDqQM/ZCohHFannSF5ME=",
       "Description": "Modification of device sim 2",
       "Created": "2019-05-21T08:43:03Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-system:system/config/hostname",
           "Value": "localhost:10162"
@@ -241,7 +241,7 @@
       "ID": "5FTJ5QDC0y/RoFnJPfdh8NsB+4Y=",
       "Description": "Modification of device sim 3",
       "Created": "2019-05-21T08:43:04Z",
-      "Config" : [
+      "Config": [
         {
           "Path": "/openconfig-system:system/config/hostname",
           "Value": "localhost:10163"
@@ -251,6 +251,51 @@
           "Value": "Welcome to gNMI service on localhost:10163"
         }
       ]
+    },
+    "ZOBFNpGhCHoc9gLiJduqY1FiTzs=": {
+      "ID": "ZOBFNpGhCHoc9gLiJduqY1FiTzs=",
+      "Description": "Modification of device-1-device-simulator",
+      "Created": "2019-05-30T18:03:17Z",
+      "Config": [
+        {
+          "Path": "/openconfig-system:system/config/hostname",
+          "Value": "device-1-device-simulator"
+        },
+        {
+          "Path": "/openconfig-system:system/config/motd-banner",
+          "Value": "Welcome to gNMI service on device-1-device-simulator"
+        }
+      ]
+    },
+    "ZYNxDoardxYaQwMtbFbf1qO9AjE=": {
+      "ID": "ZYNxDoardxYaQwMtbFbf1qO9AjE=",
+      "Description": "Modification of device-2-device-simulator",
+      "Created": "2019-05-30T18:03:17Z",
+      "Config": [
+        {
+          "Path": "/openconfig-system:system/config/hostname",
+          "Value": "device-2-device-simulator"
+        },
+        {
+          "Path": "/openconfig-system:system/config/motd-banner",
+          "Value": "Welcome to gNMI service on device-2-device-simulator"
+        }
+      ]
+    },
+    "pLAjo6M3icVnLsZ8ZOjSaELH8SQ=": {
+      "ID": "pLAjo6M3icVnLsZ8ZOjSaELH8SQ=",
+      "Description": "Modification of device-3-device-simulator",
+      "Created": "2019-05-30T18:03:17Z",
+      "Config": [
+        {
+          "Path": "/openconfig-system:system/config/hostname",
+          "Value": "device-3-device-simulator"
+        },
+        {
+          "Path": "/openconfig-system:system/config/motd-banner",
+          "Value": "Welcome to gNMI service on device-3-device-simulator"
+        }
+      ]
     }
   }
 }
diff --git a/deployments/helm/onos-config/files/configs/configStore-sample.json b/deployments/helm/onos-config/files/configs/configStore-sample.json
@@ -161,6 +161,108 @@
           "Organisation": "OpenConfig working group"
         }
       ]
+    },
+    "device-1-device-simulator-1.0.0": {
+      "Name": "device-1-device-simulator-1.0.0",
+      "Device": "device-1-device-simulator",
+      "Version": "1.0.0",
+      "Type": "Devicesim",
+      "Created": "2019-05-30T18:03:17Z",
+      "Updated": "2019-05-30T18:03:17Z",
+      "Changes": [
+        "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
+        "ZOBFNpGhCHoc9gLiJduqY1FiTzs="
+      ],
+      "Models": [
+        {
+          "Name": "openconfig-interfaces",
+          "Version": "2.0.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-openflow",
+          "Version": "0.1.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-platform",
+          "Version": "0.5.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-system",
+          "Version": "0.2.0",
+          "Organisation": "OpenConfig working group"
+        }
+      ]
+    },
+    "device-2-device-simulator-1.0.0": {
+      "Name": "device-2-device-simulator-1.0.0",
+      "Device": "device-2-device-simulator",
+      "Version": "1.0.0",
+      "Type": "Devicesim",
+      "Created": "2019-05-30T18:03:17Z",
+      "Updated": "2019-05-30T18:03:17Z",
+      "Changes": [
+        "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
+        "ZYNxDoardxYaQwMtbFbf1qO9AjE="
+      ],
+      "Models": [
+        {
+          "Name": "openconfig-interfaces",
+          "Version": "2.0.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-openflow",
+          "Version": "0.1.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-platform",
+          "Version": "0.5.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-system",
+          "Version": "0.2.0",
+          "Organisation": "OpenConfig working group"
+        }
+      ]
+    },
+    "device-3-device-simulator-1.0.0": {
+      "Name": "device-3-device-simulator-1.0.0",
+      "Device": "device-3-device-simulator",
+      "Version": "1.0.0",
+      "Type": "Devicesim",
+      "Created": "2019-05-30T18:03:17Z",
+      "Updated": "2019-05-30T18:03:17Z",
+      "Changes": [
+        "4cQNf/bxKWdRO0h5GG4a58q5YEQ=",
+        "pLAjo6M3icVnLsZ8ZOjSaELH8SQ="
+      ],
+      "Models": [
+        {
+          "Name": "openconfig-interfaces",
+          "Version": "2.0.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-openflow",
+          "Version": "0.1.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-platform",
+          "Version": "0.5.0",
+          "Organisation": "OpenConfig working group"
+        },
+        {
+          "Name": "openconfig-system",
+          "Version": "0.2.0",
+          "Organisation": "OpenConfig working group"
+        }
+      ]
     }
   }
 }