cfgen: add test sample query

Summary: add test sample queries for easier management. there're some test samples already gone, so updated them in the meanwhile, but there was no change in the test outputs. Reviewed By: anps77 Differential Revision: D58393835 fbshipit-source-id: c25eee76cb8811b8b92c2d95d65d0ec5e82516c0
facebookincubator · Jun 11, 2024 · 78b8a47 · 78b8a47
1 parent b9c2949
commit 78b8a47
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 38 deletions.
diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/dns.json b/src/oomd/cfgen/test/cfgen_test_inputs/dns.json
@@ -1,4 +1,4 @@
-@generated SignedSource<<bb514058e1c368e3c0b85727a9d2bf40>>
+@generated SignedSource<<e72ebb92ee7c427ba5793d54e25e75d1>>
 @codegen-command arc cfgen update-inputs fb-oomd
 {
   "fqdn": "dns05.17.prn3.facebook.com",
@@ -36,7 +36,9 @@
         "vendor_id": 5348,
         "device_id": 5969,
         "class_code": 131072,
-        "board_part_number": "BCM957504-N1100FYB"
+        "board_part_number": "BCM957504-N1100FYB",
+        "current_speed_mts": 8000,
+        "current_width": 4
       }
     },
     "static_smc_tiers": [],
@@ -48,7 +50,8 @@
         "driver": "bnxt_en",
         "driver_version": "5.19.0-0_fbk21_12633_g4db063a1b",
         "firmware_version": "225.0.157.0/pkg 225.1.109.0",
-        "bus_info": "0000:67:00.0"
+        "bus_info": "0000:67:00.0",
+        "speed_mbps": 100000
       }
     }
   },
@@ -77,7 +80,8 @@
     "device_nics_enum": [
       "ETH0",
       "SVC0"
-    ]
+    ],
+    "loaded_kernel_modules": []
   },
   "reservationConfig": {}
 }
diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twpool_no_senpai.json b/src/oomd/cfgen/test/cfgen_test_inputs/twpool_no_senpai.json
@@ -1,9 +1,9 @@
-@generated SignedSource<<385d00650b8b80058480fedbea087963>>
+@generated SignedSource<<deb3eb5e13320267e73139b00f6448d2>>
 @codegen-command arc cfgen update-inputs fb-oomd
 {
-  "fqdn": "tw023.04.vll2.facebook.com",
-  "region": "newmexico",
-  "clusterType": "HADOOP",
+  "fqdn": "tw130.03.ldc2.facebook.com",
+  "region": "loudoun",
+  "clusterType": "SERVICE_GENERIC_NON_MEMCACHE",
   "modelId": 331202,
   "kernelRelease": "5.19.0-0_fbk12_11583_g0bef9520ca2b",
   "serverType": "TYPE_VI_FEED",
@@ -13,16 +13,18 @@
   "provisioningConfig": {
     "ethtoolByInterface": {
       "eth0": {
-        "maxChannelsCombined": 63
+        "maxChannelsCombined": 128,
+        "maxChannelsRx": 64,
+        "maxChannelsTx": 64
       }
     },
     "cpuCoreCount": 40,
     "parentModelId": 333803,
     "recoveryEnvironment": false,
     "deviceType": "SERVER",
-    "datacenter": "vll2",
-    "cluster": "04",
-    "memTotal": 270019551232,
+    "datacenter": "ldc2",
+    "cluster": "03",
+    "memTotal": 270019469312,
     "osVersion": {
       "distribution_name": "CentOS Stream release",
       "version": 9,
@@ -31,10 +33,10 @@
     },
     "pciByAddress": {
       "0000:5e:00.0": {
-        "vendor_id": 5555,
-        "device_id": 4117,
+        "vendor_id": 5348,
+        "device_id": 5833,
         "class_code": 131072,
-        "board_part_number": "MCX4411D-ACAN_FB"
+        "board_part_number": "BCM957302M3023CBK"
       }
     },
     "static_smc_tiers": [],
@@ -43,23 +45,23 @@
   "bootConfig": {
     "ethtoolByInterface": {
       "eth0": {
-        "driver": "mlx5_core",
+        "driver": "bnxt_en",
         "driver_version": "5.19.0-0_fbk12_11583_g0bef9520c",
-        "firmware_version": "14.27.2606 (FB_0000000005)",
+        "firmware_version": "20.6.167.0/pkg 20.6.4.12",
         "bus_info": "0000:5e:00.0"
       }
     }
   },
   "runtimeConfig": {
     "hasHighPrivCert": true,
-    "regionRoutableCluster": "vll1.02",
+    "regionRoutableCluster": "ldc1.02",
     "block_devices": {
       "block_devices": {
         "sda": {
           "size_bytes": 2000398934016,
           "is_rotational": true,
           "model": "HGST HUS722T2TALA604",
-          "serial": "WMC6N0P94N1J",
+          "serial": "WMC6N0R0FFAW",
           "physical_block_size": 512,
           "logical_block_size": 512,
           "is_root": true

diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled.json b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled.json
@@ -1,4 +1,4 @@
-@generated SignedSource<<5ad6adf39ebb79c51d54ce424e240bb0>>
+@generated SignedSource<<9acea0c585c99a8d3339ae5cc6cc1725>>
 @codegen-command arc cfgen update-inputs fb-oomd
 {
   "fqdn": "twshared44829.07.ash9.facebook.com",
@@ -91,7 +91,7 @@
     ]
   },
   "reservationConfig": {
-    "active_machine_materialization_id": "6315e4a4e4c65",
-    "current_reservation_host_profile_id": "COMMON:NO_CPU_CONTROLLER|KERNEL:kernel_5.12.0-0_fbk13_clang_7455_gb24de3bdb045_base.v8|STORAGE:XFS_FULL|RUNTIME:DATASTORES_GENERIC_SYSCTLS|KERNEL_ARGS:kargs_default.v2|KERNEL_POLICY:KERNEL_POLICY_DATABASES|BOOT_CONFIG:bootloader814_initrd230_swap16G_native_arch|OS:CLASSIC"
+    "active_machine_materialization_id": "6321b443b7f1a",
+    "current_reservation_host_profile_id": "COMMON:NO_CPU_CONTROLLER|KERNEL:kernel_5.12.0-0_fbk13_clang_7455_gb24de3bdb045_base.v8|STORAGE:XFS_FULL|POWER:CPU_PERF_OPT|RUNTIME:DATASTORES_GENERIC_SYSCTLS|KERNEL_ARGS:kargs_default.v2|KERNEL_POLICY:KERNEL_POLICY_DATABASES|BOOT_CONFIG:bootloader814_initrd230_swap16G_native_arch|OS:CLASSIC"
   }
 }
diff --git a/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled_sandisk.json b/src/oomd/cfgen/test/cfgen_test_inputs/twshared_senpai_disabled_sandisk.json
@@ -1,11 +1,11 @@
-@generated SignedSource<<abf5163c81fbfcbc1599a3f7ec339d4b>>
+@generated SignedSource<<e0eb0af2e5f530923bb2108e23e1da3e>>
 @codegen-command arc cfgen update-inputs fb-oomd
 {
-  "fqdn": "twshared16157.35.frc1.facebook.com",
+  "fqdn": "twshared15369.35.frc1.facebook.com",
   "region": "carolina",
   "clusterType": "SERVICE_GENERIC_NON_MEMCACHE",
   "modelId": 56441,
-  "kernelRelease": "6.4.3-0_fbk11_2563_g44ec95f7d7f4",
+  "kernelRelease": "6.4.3-0_fbk2_785_gacbb203ea6ff",
   "serverType": "TYPE_I_WEB",
   "experiments": [],
   "cpuArchitecture": "broadwellde",
@@ -22,7 +22,7 @@
     "deviceType": "SERVER",
     "datacenter": "frc1",
     "cluster": "35",
-    "memTotal": 33468424192,
+    "memTotal": 33468592128,
     "osVersion": {
       "distribution_name": "CentOS Stream",
       "version": 9,
@@ -45,7 +45,7 @@
     "ethtoolByInterface": {
       "eth0": {
         "driver": "mlx5_core",
-        "driver_version": "6.4.3-0_fbk11_2563_g44ec95f7d7f",
+        "driver_version": "6.4.3-0_fbk2_785_gacbb203ea6ff",
         "firmware_version": "14.27.2606 (FB_2510111032)",
         "bus_info": "0000:04:00.0"
       }
@@ -74,7 +74,7 @@
           "size_bytes": 256060514304,
           "is_rotational": false,
           "model": "SanDisk SD7SN6S256G",
-          "serial": "151933400106",
+          "serial": "162993401660",
           "physical_block_size": 512,
           "logical_block_size": 512,
           "is_root": true
@@ -94,7 +94,7 @@
     ]
   },
   "reservationConfig": {
-    "active_machine_materialization_id": "64ba98d886d6b",
-    "current_reservation_host_profile_id": "KERNEL:kernel_6.4.3-0_fbk11_2563_g44ec95f7d7f4_base.v0|KERNEL_ARGS:kargs_consoleS057600.v1|BOOT_CONFIG:bootloader659_initrd201_swap16G_native_arch"
+    "active_machine_materialization_id": "63d2bf3f97b2d",
+    "current_reservation_host_profile_id": "KERNEL:kernel_6.4.3-0_fbk2_785_gacbb203ea6ff_base.v0|KERNEL_ARGS:kargs_consoleS057600.v1|BOOT_CONFIG:bootloader692_initrd208_swap16G_native_arch"
   }
 }
diff --git a/src/oomd/cfgen/test/cfgen_test_manifest.yml b/src/oomd/cfgen/test/cfgen_test_manifest.yml
@@ -24,20 +24,20 @@ samples:
     # And then pick a record that has `components[disk].is_rootdrive=1` and `components[disk].disk_obj.is_flash=0`
     production_host: twshared44829.07.ash9
   twshared_senpai_disabled_sandisk:
-    # this host is a sample from the "wdb config monitor" scuba table
-    production_host: twshared16157.35.frc1.facebook.com
+    # serf get --fields 'name' --limit 100 'hostnameScheme_obj.name=twshared,components[disk].disk_obj.model=SD7SN6S256G'
+    production_host: twshared15369.35.frc1.facebook.com
   dns:
-    # this host is a sample from the "wdb config monitor" scuba table
+    # serf get --fields name --limit 100 'hostnameScheme_obj.name=dns'
     production_host: dns05.17.prn3.facebook.com
   synmon:
-    # this host is a sample from the "wdb config monitor" scuba table
+    # serf get --fields name --limit 100 'hostnameScheme_obj.name=synmon'
     production_host: synmon017.rva2.facebook.com
   devbig:
-    # this host is a sample from the "wdb config monitor" scuba table
+    # serf get --fields name --limit 100 'hostnameScheme_obj.name=devbig'
     production_host: devbig284.ash8.facebook.com
   twpool:
-    # this host is a sample from the "wdb config monitor" scuba table
+    # serf get --fields name --limit 100 'hostnameScheme_obj.name=tw,components[disk].is_rootdrive=1,components[disk].disk_obj.is_flash=1'
     production_host: tw066.02.cln2.facebook.com
   twpool_no_senpai:
-    # this host is a sample from the "wdb config monitor" scuba table
-    production_host: tw023.04.vll2.facebook.com
+    # serf get --fields name --limit 100 'hostnameScheme_obj.name=tw,components[disk].is_rootdrive=1,components[disk].disk_obj.is_flash=0'
+    production_host: tw130.03.ldc2.facebook.com