Upgrade to VSS 5.0

Changes:
- Update vss-agl recipe for the new vss-tools 5.0 syntax.
- Update signal name in agl-vss-helper configuration.

Bug-AGL: SPEC-5299

Change-Id: I3e9017f672769ba217454609ccfa2c50d3202fde
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30538
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account

3 files changed, 74 insertions, 66 deletions

diff --git a/recipes-connectivity/vss/vss-agl_4.2.bb b/recipes-connectivity/vss/vss-agl_4.2.bb
deleted file mode 100644
index 981ba1645..000000000
--- a/recipes-connectivity/vss/vss-agl_4.2.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-SUMMARY = "Vehicle Signal Specification with AGL overlays"
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
-
-DEPENDS = "vss-tools-native"
-
-inherit allarch update-alternatives
-
-require recipes-support/vss/vss.inc
-
-SRC_URI += "file://agl_vss_overlay.vspec \
-            file://agl_vss_overlay.vspec.control-panel \
-            file://agl_vss_overlay.vspec.gw-control-panel \
-            file://agl_vss_overlay.vspec.gw-hardware \
-"
-# Since we're not relying on the simple upstream repo Makefile, use
-# best practices and output into a separate directory.
-B = "${WORKDIR}/build"
-
-do_configure[noexec] = "1"
-
-VSPEC2JSON_OPTS = "-e dbc2vss,vss2dbc --no-uuid --json-pretty"
-
-do_compile() {
-    vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl.json
-    vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-control-panel.json
-    vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.gw-control-panel -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-control-panel.json
-    vspec2json.py -I ${S}/spec ${VSPEC2JSON_OPTS} -o ${WORKDIR}/agl_vss_overlay.vspec.gw-hardware -u ${S}/spec/units.yaml ${S}/spec/VehicleSignalSpecification.vspec vss_rel_${PV}-agl-gw-hardware.json
-}
-
-do_install() {
-    install -d ${D}${datadir}/vss
-    install -m 0644 vss_rel_${PV}-agl.json ${D}${datadir}/vss/
-    install -m 0644 vss_rel_${PV}-agl-control-panel.json ${D}${datadir}/vss/
-    install -m 0644 vss_rel_${PV}-agl-gw-control-panel.json ${D}${datadir}/vss/
-    install -m 0644 vss_rel_${PV}-agl-gw-hardware.json ${D}${datadir}/vss/
-}
-
-PACKAGE_BEFORE_PN += "${PN}-control-panel ${PN}-gw-control-panel ${PN}-gw-hardware"
-
-ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json"
-
-ALTERNATIVE:${PN} = "vss.json"
-ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_rel_${PV}-agl.json"
-ALTERNATIVE_PRIORITY_${PN} = "20"
-FILES:${PN} += "${datadir}/vss/vss_rel_${PV}-agl.json"
-
-ALTERNATIVE:${PN}-control-panel = "vss.json"
-ALTERNATIVE_TARGET_${PN}-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json"
-ALTERNATIVE_PRIORITY_${PN}-control-panel = "30"
-FILES:${PN}-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-control-panel.json"
-
-ALTERNATIVE:${PN}-gw-hardware = "vss.json"
-ALTERNATIVE_TARGET_${PN}-gw-hardware = "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json"
-ALTERNATIVE_PRIORITY_${PN}-gw-hardware = "31"
-FILES:${PN}-gw-hardware += "${datadir}/vss/vss_rel_${PV}-agl-gw-hardware.json"
-
-# Higher priority than gw-hardware, as we want it to be the default
-# if both are installed (as is the case with the full gateway demo
-# setup).
-ALTERNATIVE:${PN}-gw-control-panel = "vss.json"
-ALTERNATIVE_TARGET_${PN}-gw-control-panel = "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json"
-ALTERNATIVE_PRIORITY_${PN}-gw-control-panel = "32"
-FILES:${PN}-gw-control-panel += "${datadir}/vss/vss_rel_${PV}-agl-gw-control-panel.json"
diff --git a/recipes-connectivity/vss/vss-agl_5.0.bb b/recipes-connectivity/vss/vss-agl_5.0.bb
new file mode 100644
index 000000000..e86824315
--- /dev/null
+++ b/recipes-connectivity/vss/vss-agl_5.0.bb
@@ -0,0 +1,72 @@
+SUMMARY = "Vehicle Signal Specification with AGL overlays"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
+
+DEPENDS = "vss-tools-native"
+
+inherit allarch update-alternatives
+
+require recipes-support/vss/vss.inc
+
+SRC_URI += "file://agl_vss_overlay.vspec \
+            file://agl_vss_overlay.vspec.control-panel \
+            file://agl_vss_overlay.vspec.gw-control-panel \
+            file://agl_vss_overlay.vspec.gw-hardware \
+"
+# Since we're not relying on the simple upstream repo Makefile, use
+# best practices and output into a separate directory.
+B = "${WORKDIR}/build"
+
+do_configure[noexec] = "1"
+
+VSPEC_JSON_OPTS = " \
+    -I ${S}/spec \
+    -u ${S}/spec/units.yaml \
+    --vspec ${S}/spec/VehicleSignalSpecification.vspec \
+    -e dbc2vss \
+    -e vss2dbc \
+    --no-uuid \
+    --pretty \
+"
+
+do_compile() {
+    vspec export json ${VSPEC_JSON_OPTS} -l ${WORKDIR}/agl_vss_overlay.vspec --output vss_${PV}-agl.json
+    vspec export json ${VSPEC_JSON_OPTS} -l ${WORKDIR}/agl_vss_overlay.vspec.control-panel --output vss_${PV}-agl-control-panel.json
+    vspec export json ${VSPEC_JSON_OPTS} -l ${WORKDIR}/agl_vss_overlay.vspec.gw-control-panel --output vss_${PV}-agl-gw-control-panel.json
+    vspec export json ${VSPEC_JSON_OPTS} -l ${WORKDIR}/agl_vss_overlay.vspec.gw-hardware --output vss_${PV}-agl-gw-hardware.json
+}
+
+do_install() {
+    install -d ${D}${datadir}/vss
+    install -m 0644 vss_${PV}-agl.json ${D}${datadir}/vss/
+    install -m 0644 vss_${PV}-agl-control-panel.json ${D}${datadir}/vss/
+    install -m 0644 vss_${PV}-agl-gw-control-panel.json ${D}${datadir}/vss/
+    install -m 0644 vss_${PV}-agl-gw-hardware.json ${D}${datadir}/vss/
+}
+
+PACKAGE_BEFORE_PN += "${PN}-control-panel ${PN}-gw-control-panel ${PN}-gw-hardware"
+
+ALTERNATIVE_LINK_NAME[vss.json] = "${datadir}/vss/vss.json"
+
+ALTERNATIVE:${PN} = "vss.json"
+ALTERNATIVE_TARGET_${PN} = "${datadir}/vss/vss_${PV}-agl.json"
+ALTERNATIVE_PRIORITY_${PN} = "20"
+FILES:${PN} += "${datadir}/vss/vss_${PV}-agl.json"
+
+ALTERNATIVE:${PN}-control-panel = "vss.json"
+ALTERNATIVE_TARGET_${PN}-control-panel = "${datadir}/vss/vss_${PV}-agl-control-panel.json"
+ALTERNATIVE_PRIORITY_${PN}-control-panel = "30"
+FILES:${PN}-control-panel += "${datadir}/vss/vss_${PV}-agl-control-panel.json"
+
+ALTERNATIVE:${PN}-gw-hardware = "vss.json"
+ALTERNATIVE_TARGET_${PN}-gw-hardware = "${datadir}/vss/vss_${PV}-agl-gw-hardware.json"
+ALTERNATIVE_PRIORITY_${PN}-gw-hardware = "31"
+FILES:${PN}-gw-hardware += "${datadir}/vss/vss_${PV}-agl-gw-hardware.json"
+
+# Higher priority than gw-hardware, as we want it to be the default
+# if both are installed (as is the case with the full gateway demo
+# setup).
+ALTERNATIVE:${PN}-gw-control-panel = "vss.json"
+ALTERNATIVE_TARGET_${PN}-gw-control-panel = "${datadir}/vss/vss_${PV}-agl-gw-control-panel.json"
+ALTERNATIVE_PRIORITY_${PN}-gw-control-panel = "32"
+FILES:${PN}-gw-control-panel += "${datadir}/vss/vss_${PV}-agl-gw-control-panel.json"
diff --git a/recipes-demo/agl-vss-helper/files/agl-vss-helper.yaml b/recipes-demo/agl-vss-helper/files/agl-vss-helper.yaml
index 21b5ce9a0..22d77e303 100644
--- a/recipes-demo/agl-vss-helper/files/agl-vss-helper.yaml
+++ b/recipes-demo/agl-vss-helper/files/agl-vss-helper.yaml
@@ -63,9 +63,9 @@ initialize:
   value: false
 - signal: Vehicle.Powertrain.TractionBattery.Charging.IsCharging
   value: false
-- signal: Vehicle.Powertrain.TractionBattery.Charging.IsChargingCableConnected
+- signal: Vehicle.Powertrain.TractionBattery.Charging.ChargingPort.AnyPosition.IsChargingCableConnected
   value: false
-- signal: Vehicle.Powertrain.TractionBattery.Charging.IsChargingCableLocked
+- signal: Vehicle.Powertrain.TractionBattery.Charging.ChargingPort.AnyPosition.IsChargingCableLocked
   value: false
 - signal: Vehicle.Powertrain.TractionBattery.Charging.IsDischarging
   value: false