Support default for pathtype: "regex" and use it

Add support for setting a default-value for pathtype: "regex", and add a default value to the image and init_image fields for deviceplugin. There are probably other places that need it, but that'll have to be added later. Signed-off-by: David Weinehall <[email protected]>
intel · Oct 25, 2024 · 774de10 · 774de10
1 parent 4adb638
commit 774de10
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/cmu b/cmu
@@ -1606,13 +1606,16 @@ def get_obj(obj: Dict, field_dict: Dict, field_names: List[str],
                     _regexes = deep_get(_path, DictPath("regex"), [])
                     if isinstance(_regexes, str):
                         _regexes = [_regexes]
-                    for _regex in _regexes:
-                        _tmp = re.match(_regex, _raw)
-                        if _tmp is not None:
-                            for group in _tmp.groups():
-                                if group is not None:
-                                    value.append(group)
-                            break
+                    if _raw is not None and _raw:
+                        for _regex in _regexes:
+                            _tmp = re.match(_regex, _raw)
+                            if _tmp is not None:
+                                for group in _tmp.groups():
+                                    if group is not None:
+                                        value.append(group)
+                                break
+                    elif default:
+                        value = default
                     value = tuple(value)
                     _values.append((value, "raw"))
                 elif ptype == "tuple":

diff --git a/views/DlbDevicePlugin.deviceplugin.intel.com.yaml b/views/DlbDevicePlugin.deviceplugin.intel.com.yaml
@@ -63,6 +63,7 @@ infoview:
         - path: "spec#image"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:
@@ -76,6 +77,7 @@ infoview:
         - path: "spec#initImage"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:

diff --git a/views/DsaDevicePlugin.deviceplugin.intel.com.yaml b/views/DsaDevicePlugin.deviceplugin.intel.com.yaml
@@ -63,6 +63,7 @@ infoview:
         - path: "spec#image"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:
@@ -76,6 +77,7 @@ infoview:
         - path: "spec#initImage"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:

diff --git a/views/GpuDevicePlugin.deviceplugin.intel.com.yaml b/views/GpuDevicePlugin.deviceplugin.intel.com.yaml
@@ -67,6 +67,7 @@ infoview:
         - path: "spec#image"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:
@@ -80,6 +81,7 @@ infoview:
         - path: "spec#initImage"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:

diff --git a/views/IaaDevicePlugin.deviceplugin.intel.com.yaml b/views/IaaDevicePlugin.deviceplugin.intel.com.yaml
@@ -63,6 +63,7 @@ infoview:
         - path: "spec#image"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:
@@ -76,6 +77,7 @@ infoview:
         - path: "spec#initImage"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:

diff --git a/views/QatDevicePlugin.deviceplugin.intel.com.yaml b/views/QatDevicePlugin.deviceplugin.intel.com.yaml
@@ -67,6 +67,7 @@ infoview:
         - path: "spec#image"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors:
@@ -80,6 +81,7 @@ infoview:
         - path: "spec#initImage"
           pathtype: "regex"
           regex: "^([^:]+):(.*)"
+          default: ["<none>"]
         formatter: "list"
         formatting:
           field_colors: