Remove unnecessary trim levels from car name (#20815)

* remove unnecessary trim levels from car name

* remove hardcoded strings

* fix process replay

* more fixes

* fix migration

* update ref
old-commit-hash: 7a8f61f4bf83d18d2fca5fd42eb2d24849d3e58f

selfdrive/test/process_replay/process_replay.py

@@ -359,13 +359,21 @@ def python_replay_process(cfg, lr):
   os.environ['NO_RADAR_SLEEP'] = "1"
   os.environ['SKIP_FW_QUERY'] = ""
   os.environ['FINGERPRINT'] = ""
+
+  # TODO: remove after getting new route for civic & accord
+  migration = {
+    "HONDA CIVIC 2016 TOURING": "HONDA CIVIC 2016",
+    "HONDA ACCORD 2018 SPORT 2T": "HONDA ACCORD 2018 2T",
+  }
+
   for msg in lr:
     if msg.which() == 'carParams':
-      if len(msg.carParams.carFw) and (msg.carParams.carFingerprint in FW_VERSIONS):
+      car_fingerprint = migration.get(msg.carParams.carFingerprint, msg.carParams.carFingerprint)
+      if len(msg.carParams.carFw) and (car_fingerprint in FW_VERSIONS):
         params.put("CarParamsCache", msg.carParams.as_builder().to_bytes())
       else:
         os.environ['SKIP_FW_QUERY'] = "1"
-        os.environ['FINGERPRINT'] = msg.carParams.carFingerprint
+        os.environ['FINGERPRINT'] = car_fingerprint
 
   assert(type(managed_processes[cfg.proc_name]) is PythonProcess)
   managed_processes[cfg.proc_name].prepare()

selfdrive/test/process_replay/ref_commit

@@ -1 +1 @@
-e53498342bd6ba53e59976d284fc635368370e3d
+102840c395c0c19fb27a8f252044284834a0daf1

selfdrive/test/test_models.py

@@ -10,6 +10,10 @@ from cereal import log, car
 from selfdrive.car.fingerprints import all_known_cars
 from selfdrive.car.car_helpers import interfaces
 from selfdrive.car.honda.values import HONDA_BOSCH
+from selfdrive.car.honda.values import CAR as HONDA
+from selfdrive.car.toyota.values import CAR as TOYOTA
+from selfdrive.car.chrysler.values import CAR as CHRYSLER
+from selfdrive.car.hyundai.values import CAR as HYUNDAI
 from selfdrive.test.test_routes import routes, non_tested_cars
 from selfdrive.test.openpilotci import get_url
 from tools.lib.logreader import LogReader
@@ -23,27 +27,27 @@ ROUTES = {v['carFingerprint']: k for k, v in routes.items() if 'enableCamera' no
 
 # TODO: get updated routes for these cars
 ignore_can_valid = [
-  "ACURA ILX 2016 ACURAWATCH PLUS",
-  "LEXUS RX HYBRID 2017",
-  "TOYOTA AVALON 2016",
-  "HONDA PILOT 2019 ELITE",
-  "HYUNDAI SANTA FE LIMITED 2019",
+  HONDA.ACURA_ILX,
+  TOYOTA.LEXUS_RXH,
+  TOYOTA.AVALON,
+  HONDA.PILOT_2019,
+  HYUNDAI.SANTA_FE,
 
   # TODO: get new routes for these cars, current routes are from giraffe with different buses
-  "HONDA CR-V 2019 HYBRID",
-  "HONDA INSIGHT 2019 TOURING",
-  "HONDA ACCORD 2018 HYBRID TOURING",
+  HONDA.CRV_HYBRID,
+  HONDA.INSIGHT,
+  HONDA.ACCORDH,
 ]
 
 ignore_carstate_check = [
   # TODO: chrysler gas state in panda also checks wheel speed, refactor so it's only gas
-  "CHRYSLER PACIFICA HYBRID 2017",
+  CHRYSLER.PACIFICA_2017_HYBRID,
 
   # TODO: get new routes for these cars, current routes are from giraffe with different buses
-  "HONDA CR-V 2019 HYBRID",
-  "HONDA ACCORD 2018 SPORT 2T",
-  "HONDA INSIGHT 2019 TOURING",
-  "HONDA ACCORD 2018 HYBRID TOURING",
+  HONDA.CRV_HYBRID,
+  HONDA.ACCORD,
+  HONDA.INSIGHT,
+  HONDA.ACCORDH,
 ]
 
 @parameterized_class(('car_model'), [(car,) for car in all_known_cars()])