fix(sztp): add more cards

Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
opiproject · Jun 6, 2024 · 0a34bfd · 0a34bfd
1 parent b8ea498
commit 0a34bfd
Show file tree

Hide file tree

Showing 17 changed files with 145 additions and 16 deletions.
diff --git a/sztp/my-boot-image.img → sztp/amd-boot-image.img b/sztp/my-boot-image.img → sztp/amd-boot-image.img
diff --git a/sztp/my-configuration.xml → sztp/amd-configuration.xml b/sztp/my-configuration.xml → sztp/amd-configuration.xml
diff --git a/sztp/my-post-configuration-script.sh → sztp/amd-post-configuration-script.sh b/sztp/my-post-configuration-script.sh → sztp/amd-post-configuration-script.sh
diff --git a/sztp/my-pre-configuration-script.sh → sztp/amd-pre-configuration-script.sh b/sztp/my-pre-configuration-script.sh → sztp/amd-pre-configuration-script.sh
diff --git a/sztp/intel-boot-image.img b/sztp/intel-boot-image.img
diff --git a/sztp/intel-configuration.xml b/sztp/intel-configuration.xml
@@ -0,0 +1,3 @@
+<top xmlns="https:/example.com/config">
+  <any-xml-content-okay/>
+</top>
diff --git a/sztp/intel-post-configuration-script.sh b/sztp/intel-post-configuration-script.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "inside the post-configuration-script..."
diff --git a/sztp/intel-pre-configuration-script.sh b/sztp/intel-pre-configuration-script.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "inside the pre-configuration-script..."
diff --git a/sztp/marvell-boot-image.img b/sztp/marvell-boot-image.img
diff --git a/sztp/marvell-configuration.xml b/sztp/marvell-configuration.xml
@@ -0,0 +1,3 @@
+<top xmlns="https:/example.com/config">
+  <any-xml-content-okay/>
+</top>
diff --git a/sztp/marvell-post-configuration-script.sh b/sztp/marvell-post-configuration-script.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "inside the post-configuration-script..."
diff --git a/sztp/marvell-pre-configuration-script.sh b/sztp/marvell-pre-configuration-script.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "inside the pre-configuration-script..."
diff --git a/sztp/nvidia-boot-image.img b/sztp/nvidia-boot-image.img
diff --git a/sztp/nvidia-configuration.xml b/sztp/nvidia-configuration.xml
@@ -0,0 +1,3 @@
+<top xmlns="https:/example.com/config">
+  <any-xml-content-okay/>
+</top>
diff --git a/sztp/nvidia-post-configuration-script.sh b/sztp/nvidia-post-configuration-script.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "inside the post-configuration-script..."
diff --git a/sztp/nvidia-pre-configuration-script.sh b/sztp/nvidia-pre-configuration-script.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "inside the pre-configuration-script..."
diff --git a/sztp/sztpd.running.json.template b/sztp/sztpd.running.json.template
@@ -117,7 +117,45 @@
               "response": {
                 "conveyed-information": {
                   "onboarding-information": {
-                    "reference": "my-onboarding-information"
+                    "reference": "nvidia-onboarding-information"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "serial-number": "intel-serial-number",
+        "device-type": "my-device-type",
+        "activation-code": "$0$my-secret",
+        "response-manager": {
+          "matched-response": [
+            {
+              "name": "catch-all-response",
+              "response": {
+                "conveyed-information": {
+                  "onboarding-information": {
+                    "reference": "intel-onboarding-information"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "serial-number": "marvell-serial-number",
+        "device-type": "my-device-type",
+        "activation-code": "$0$my-secret",
+        "response-manager": {
+          "matched-response": [
+            {
+              "name": "catch-all-response",
+              "response": {
+                "conveyed-information": {
+                  "onboarding-information": {
+                    "reference": "marvell-onboarding-information"
                   }
                 }
               }
@@ -130,15 +168,41 @@
   "wn-sztpd-1:boot-images": {
     "boot-image": [
       {
-        "name": "my-boot-image.img",
+        "name": "nvidia-boot-image.img",
+        "download-uri": [
+          "http://web:80/nvidia-boot-image.img",
+          "ftp://web:82/nvidia-boot-image.img"
+        ],
+        "image-verification": [
+          {
+            "hash-algorithm": "ietf-sztp-conveyed-info:sha-256",
+            "hash-value": "$NVIDIA_BOOT_IMG_HASH_VAL"
+          }
+        ]
+      },
+      {
+        "name": "intel-boot-image.img",
+        "download-uri": [
+          "http://web:80/nvidia-boot-image.img",
+          "ftp://web:82/nvidia-boot-image.img"
+        ],
+        "image-verification": [
+          {
+            "hash-algorithm": "ietf-sztp-conveyed-info:sha-256",
+            "hash-value": "$INTEL_BOOT_IMG_HASH_VAL"
+          }
+        ]
+      },
+      {
+        "name": "marvell-boot-image.img",
         "download-uri": [
-          "http://web:80/my-boot-image.img",
-          "ftp://web:82/my-boot-image.img"
+          "http://web:80/marvell-boot-image.img",
+          "ftp://web:82/marvell-boot-image.img"
         ],
         "image-verification": [
           {
             "hash-algorithm": "ietf-sztp-conveyed-info:sha-256",
-            "hash-value": "$BOOT_IMG_HASH_VAL"
+            "hash-value": "$MARVELL_BOOT_IMG_HASH_VAL"
           }
         ]
       }
@@ -147,35 +211,79 @@
   "wn-sztpd-1:scripts": {
       "pre-configuration-script": [
           {
-              "name": "my-pre-configuration-script",
-              "script": "$PRE_SCRIPT_B64"
+              "name": "nvidia-pre-configuration-script",
+              "script": "$NVIDIA_PRE_SCRIPT_B64"
+          },
+          {
+              "name": "intel-pre-configuration-script",
+              "script": "$INTEL_PRE_SCRIPT_B64"
+          },
+          {
+              "name": "marvell-pre-configuration-script",
+              "script": "$MARVELL_PRE_SCRIPT_B64"
           }
       ],
       "post-configuration-script": [
           {
-              "name": "my-post-configuration-script",
-              "script": "$POST_SCRIPT_B64"
+              "name": "nvidia-post-configuration-script",
+              "script": "$NVIDIA_POST_SCRIPT_B64"
+          },
+          {
+              "name": "intel-post-configuration-script",
+              "script": "$INTEL_POST_SCRIPT_B64"
+          },
+          {
+              "name": "marvell-post-configuration-script",
+              "script": "$MARVELL_POST_SCRIPT_B64"
           }
       ]
   },
   "wn-sztpd-1:configurations": {
       "configuration": [
           {
-              "name": "my-configuration",
+              "name": "nvidia-configuration",
+              "configuration-handling": "merge",
+              "config": "$NVIDIA_CONFIG_B64"
+          },
+          {
+              "name": "intel-configuration",
+              "configuration-handling": "merge",
+              "config": "$INTEL_CONFIG_B64"
+          },
+          {
+              "name": "marvell-configuration",
               "configuration-handling": "merge",
-              "config": "$CONFIG_B64"
+              "config": "$MARVELL_CONFIG_B64"
           }
       ]
   },
   "wn-sztpd-1:conveyed-information-responses": {
       "onboarding-information-response": [
           {
-              "name": "my-onboarding-information",
+              "name": "nvidia-onboarding-information",
+              "onboarding-information": {
+                  "boot-image": "nvidia-boot-image.img",
+                  "pre-configuration-script": "nvidia-pre-configuration-script",
+                  "configuration": "nvidia-configuration",
+                  "post-configuration-script": "nvidia-post-configuration-script"
+              }
+          },
+          {
+              "name": "intel-onboarding-information",
+              "onboarding-information": {
+                  "boot-image": "intel-boot-image.img",
+                  "pre-configuration-script": "intel-pre-configuration-script",
+                  "configuration": "intel-configuration",
+                  "post-configuration-script": "intel-post-configuration-script"
+              }
+          },
+          {
+              "name": "marvell-onboarding-information",
               "onboarding-information": {
-                  "boot-image": "my-boot-image.img",
-                  "pre-configuration-script": "my-pre-configuration-script",
-                  "configuration": "my-configuration",
-                  "post-configuration-script": "my-post-configuration-script"
+                  "boot-image": "marvell-boot-image.img",
+                  "pre-configuration-script": "marvell-pre-configuration-script",
+                  "configuration": "marvell-configuration",
+                  "post-configuration-script": "marvell-post-configuration-script"
               }
           }
       ]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		echo "inside the post-configuration-script..."
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		echo "inside the pre-configuration-script..."