diff --git a/docker-sonic-alpinevs/Dockerfile.j2 b/docker-sonic-alpinevs/Dockerfile.j2 index 078ff58..9f96dfd 100644 --- a/docker-sonic-alpinevs/Dockerfile.j2 +++ b/docker-sonic-alpinevs/Dockerfile.j2 @@ -129,7 +129,6 @@ COPY ["port_breakout_config_db.json", "/etc/sonic/"] COPY ["database_config.json", "/etc/default/sonic-db/"] COPY ["hostname.j2", "/usr/share/sonic/templates/"] COPY ["init_cfg.json.j2", "/usr/share/sonic/templates/"] -COPY ["config_db.json", "/etc/sonic/"] COPY ["default_chassis_cfg.json", "/etc/default/sonic-db/"] COPY ["asic_table.json", "/etc/sonic/"] COPY ["zero_profiles.json", "/etc/sonic"] diff --git a/docker-sonic-alpinevs/config_db.json b/docker-sonic-alpinevs/config_db.json deleted file mode 100644 index 6c20c26..0000000 --- a/docker-sonic-alpinevs/config_db.json +++ /dev/null @@ -1,699 +0,0 @@ -{ - "AUTO_TECHSUPPORT": { - "GLOBAL": { - "available_mem_threshold": "10.0", - "max_core_limit": "5.0", - "max_techsupport_limit": "10.0", - "min_available_mem": "200", - "rate_limit_interval": "180", - "since": "2 days ago", - "state": "enabled" - } - }, - "AUTO_TECHSUPPORT_FEATURE": { - "bgp": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "disabled" - }, - "database": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "dhcp_relay": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "eventd": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "disabled" - }, - "inbandmgr": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "linkqual": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "lldp": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "disabled" - }, - "macsec": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "mux": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "p4rt": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "pmon": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "radv": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "disabled" - }, - "sflow": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "snmp": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "disabled" - }, - "swss": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "syncd": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "teamd": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - }, - "telemetry": { - "available_mem_threshold": "10.0", - "rate_limit_interval": "600", - "state": "enabled" - } - }, - "BGP_DEVICE_GLOBAL": { - "STATE": { - "tsa_enabled": "false" - } - }, - "CRM": { - "Config": { - "acl_counter_high_threshold": "85", - "acl_counter_low_threshold": "70", - "acl_counter_threshold_type": "percentage", - "acl_entry_high_threshold": "85", - "acl_entry_low_threshold": "70", - "acl_entry_threshold_type": "percentage", - "acl_group_high_threshold": "85", - "acl_group_low_threshold": "70", - "acl_group_threshold_type": "percentage", - "acl_table_high_threshold": "85", - "acl_table_low_threshold": "70", - "acl_table_threshold_type": "percentage", - "dnat_entry_high_threshold": "85", - "dnat_entry_low_threshold": "70", - "dnat_entry_threshold_type": "percentage", - "fdb_entry_high_threshold": "85", - "fdb_entry_low_threshold": "70", - "fdb_entry_threshold_type": "percentage", - "ipmc_entry_high_threshold": "85", - "ipmc_entry_low_threshold": "70", - "ipmc_entry_threshold_type": "percentage", - "ipv4_neighbor_high_threshold": "85", - "ipv4_neighbor_low_threshold": "70", - "ipv4_neighbor_threshold_type": "percentage", - "ipv4_nexthop_high_threshold": "85", - "ipv4_nexthop_low_threshold": "70", - "ipv4_nexthop_threshold_type": "percentage", - "ipv4_route_high_threshold": "85", - "ipv4_route_low_threshold": "70", - "ipv4_route_threshold_type": "percentage", - "ipv6_neighbor_high_threshold": "85", - "ipv6_neighbor_low_threshold": "70", - "ipv6_neighbor_threshold_type": "percentage", - "ipv6_nexthop_high_threshold": "85", - "ipv6_nexthop_low_threshold": "70", - "ipv6_nexthop_threshold_type": "percentage", - "ipv6_route_high_threshold": "85", - "ipv6_route_low_threshold": "70", - "ipv6_route_threshold_type": "percentage", - "mpls_inseg_high_threshold": "85", - "mpls_inseg_low_threshold": "70", - "mpls_inseg_threshold_type": "percentage", - "mpls_nexthop_high_threshold": "85", - "mpls_nexthop_low_threshold": "70", - "mpls_nexthop_threshold_type": "percentage", - "nexthop_group_high_threshold": "85", - "nexthop_group_low_threshold": "70", - "nexthop_group_member_high_threshold": "85", - "nexthop_group_member_low_threshold": "70", - "nexthop_group_member_threshold_type": "percentage", - "nexthop_group_threshold_type": "percentage", - "polling_interval": "300", - "snat_entry_high_threshold": "85", - "snat_entry_low_threshold": "70", - "snat_entry_threshold_type": "percentage" - } - }, - "DEVICE_METADATA": { - "localhost": { - "bgp_asn": "65100", - "buffer_model": "traditional", - "default_bgp_status": "down", - "default_pfcwd_status": "disable", - "hostname": "sonic", - "hwsku": "alpine_vs", - "mac": "52:54:00:12:34:56", - "platform": "x86_64-kvm_x86_64-r0", - "synchronous_mode": "enable", - "type": "LeafRouter", - "zmq_mode": "enable" - }, - "intf_translate": { - "intf_translate": "enabled" - } - }, - "FEATURE": { - "bgp": { - "auto_restart": "disabled", - "check_up_status": "false", - "has_global_scope": "False", - "has_per_asic_scope": "True", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "database": { - "auto_restart": "always_enabled", - "has_global_scope": "True", - "has_per_asic_scope": "True", - "high_mem_alert": "disabled", - "state": "always_enabled" - }, - "dhcp_relay": { - "auto_restart": "enabled", - "check_up_status": "False", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "set_owner": "local", - "state": "disabled" - }, - "eventd": { - "auto_restart": "disabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "inbandmgr": { - "auto_restart": "enabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "enabled" - }, - "linkqual": { - "auto_restart": "enabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "enabled" - }, - "lldp": { - "auto_restart": "disabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "macsec": { - "auto_restart": "enabled", - "check_up_status": "False", - "has_global_scope": "False", - "has_per_asic_scope": "True", - "high_mem_alert": "disabled", - "set_owner": "local", - "state": "disabled" - }, - "mux": { - "auto_restart": "enabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "p4rt": { - "auto_restart": "enabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "enabled" - }, - "pmon": { - "auto_restart": "enabled", - "check_up_status": "false", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "enabled" - }, - "radv": { - "auto_restart": "disabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "sflow": { - "auto_restart": "enabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "snmp": { - "auto_restart": "disabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "swss": { - "auto_restart": "enabled", - "check_up_status": "false", - "has_global_scope": "False", - "has_per_asic_scope": "True", - "high_mem_alert": "disabled", - "state": "enabled" - }, - "syncd": { - "auto_restart": "enabled", - "has_global_scope": "False", - "has_per_asic_scope": "True", - "high_mem_alert": "disabled", - "state": "enabled" - }, - "teamd": { - "auto_restart": "enabled", - "has_global_scope": "False", - "has_per_asic_scope": "True", - "high_mem_alert": "disabled", - "state": "disabled" - }, - "telemetry": { - "auto_restart": "enabled", - "has_global_scope": "True", - "has_per_asic_scope": "False", - "high_mem_alert": "disabled", - "state": "enabled" - } - }, - "FLEX_COUNTER_TABLE": { - "ACL": { - "FLEX_COUNTER_DELAY_STATUS": "true", - "FLEX_COUNTER_STATUS": "disable", - "POLL_INTERVAL": "10000" - } - }, - "INTERFACE": { - "Ethernet0": {}, - "Ethernet4": {}, - "Ethernet8": {}, - "Ethernet12": {}, - "Ethernet16": {}, - "Ethernet20": {}, - "Ethernet24": {}, - "Ethernet28": {}, - "Ethernet32": {}, - "Ethernet36": {}, - "Ethernet40": {}, - "Ethernet44": {}, - "Ethernet48": {}, - "Ethernet52": {}, - "Ethernet56": {}, - "Ethernet60": {}, - "Ethernet64": {}, - "Ethernet68": {}, - "Ethernet72": {}, - "Ethernet76": {}, - "Ethernet80": {}, - "Ethernet84": {}, - "Ethernet88": {}, - "Ethernet92": {}, - "Ethernet96": {}, - "Ethernet100": {}, - "Ethernet104": {}, - "Ethernet108": {}, - "Ethernet112": {}, - "Ethernet116": {}, - "Ethernet120": {}, - "Ethernet124": {} - }, - "NODE_CFG": { - "integrated_circuit0": { - "node-id": "1" - } - }, - "P4RT": { - "p4rt_app": { - "p4rt_unix_socket": "/sock/p4rt.sock", - "port": "9559", - "save_forwarding_config_file": "/etc/sonic/p4rt_forwarding_config.pb.txt", - "use_genetlink": "false", - "use_port_ids": "true" - } - }, - "PASSW_HARDENING": { - "POLICIES": { - "digits_class": "true", - "expiration": "180", - "expiration_warning": "15", - "history_cnt": "10", - "len_min": "8", - "lower_class": "true", - "reject_user_passw_match": "true", - "special_class": "true", - "state": "disabled", - "upper_class": "true" - } - }, - "PORT": { - "Ethernet0": { - "admin_status": "up", - "alias": "fortyGigE0/0", - "index": "1", - "lanes": "1,2,3,4", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet4": { - "admin_status": "up", - "alias": "fortyGigE0/4", - "index": "2", - "lanes": "5,6,7,8", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet8": { - "admin_status": "up", - "alias": "fortyGigE0/8", - "index": "3", - "lanes": "9,10,11,12", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet12": { - "admin_status": "up", - "alias": "fortyGigE0/12", - "index": "4", - "lanes": "13,14,15,16", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet16": { - "admin_status": "up", - "alias": "fortyGigE0/16", - "index": "5", - "lanes": "17,18,19,20", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet20": { - "admin_status": "up", - "alias": "fortyGigE0/20", - "index": "6", - "lanes": "21,22,23,24", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet24": { - "admin_status": "up", - "alias": "fortyGigE0/24", - "index": "7", - "lanes": "25,26,27,28", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet28": { - "admin_status": "up", - "alias": "fortyGigE0/28", - "index": "8", - "lanes": "29,30,31,32", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet32": { - "admin_status": "up", - "alias": "fortyGigE0/32", - "index": "9", - "lanes": "33,34,35,36", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet36": { - "admin_status": "up", - "alias": "fortyGigE0/36", - "index": "10", - "lanes": "37,38,39,40", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet40": { - "admin_status": "up", - "alias": "fortyGigE0/40", - "index": "11", - "lanes": "41,42,43,44", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet44": { - "admin_status": "up", - "alias": "fortyGigE0/44", - "index": "12", - "lanes": "45,46,47,48", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet48": { - "admin_status": "up", - "alias": "fortyGigE0/48", - "index": "13", - "lanes": "49,50,51,52", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet52": { - "admin_status": "up", - "alias": "fortyGigE0/52", - "index": "14", - "lanes": "53,54,55,56", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet56": { - "admin_status": "up", - "alias": "fortyGigE0/56", - "index": "15", - "lanes": "57,58,59,60", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet60": { - "admin_status": "up", - "alias": "fortyGigE0/60", - "index": "16", - "lanes": "61,62,63,64", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet64": { - "admin_status": "up", - "alias": "fortyGigE0/64", - "index": "17", - "lanes": "65,66,67,68", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet68": { - "admin_status": "up", - "alias": "fortyGigE0/68", - "index": "18", - "lanes": "69,70,71,72", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet72": { - "admin_status": "up", - "alias": "fortyGigE0/72", - "index": "19", - "lanes": "73,74,75,76", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet76": { - "admin_status": "up", - "alias": "fortyGigE0/76", - "index": "20", - "lanes": "77,78,79,80", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet80": { - "admin_status": "up", - "alias": "fortyGigE0/80", - "index": "21", - "lanes": "81,82,83,84", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet84": { - "admin_status": "up", - "alias": "fortyGigE0/84", - "index": "22", - "lanes": "85,86,87,88", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet88": { - "admin_status": "up", - "alias": "fortyGigE0/88", - "index": "23", - "lanes": "89,90,91,92", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet92": { - "admin_status": "up", - "alias": "fortyGigE0/92", - "index": "24", - "lanes": "93,94,95,96", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet96": { - "admin_status": "up", - "alias": "fortyGigE0/96", - "index": "25", - "lanes": "97,98,99,100", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet100": { - "admin_status": "up", - "alias": "fortyGigE0/100", - "index": "26", - "lanes": "101,102,103,104", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet104": { - "admin_status": "up", - "alias": "fortyGigE0/104", - "index": "27", - "lanes": "105,106,107,108", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet108": { - "admin_status": "up", - "alias": "fortyGigE0/108", - "index": "28", - "lanes": "109,110,111,112", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet112": { - "admin_status": "up", - "alias": "fortyGigE0/112", - "index": "29", - "lanes": "113,114,115,116", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet116": { - "admin_status": "up", - "alias": "fortyGigE0/116", - "index": "30", - "lanes": "117,118,119,120", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet120": { - "admin_status": "up", - "alias": "fortyGigE0/120", - "index": "31", - "lanes": "121,122,123,124", - "mtu": "9100", - "presence": "1", - "speed": "40000" - }, - "Ethernet124": { - "admin_status": "up", - "alias": "fortyGigE0/124", - "index": "32", - "lanes": "125,126,127,128", - "mtu": "9100", - "presence": "1", - "speed": "40000" - } - }, - "GNMI": { - "gnmi": { - "port": "9339", - "client_auth": "false", - "user_auth": "password", - "save_on_set": "true" - }, - "certs": { - "ca_crt": "", - "server_crt": "", - "server_key": "" - } - }, - "VERSIONS": { - "DATABASE": { - "VERSION": "version_4_0_0" - } - } -} diff --git a/docker-sonic-alpinevs/copp_cfg_alpinevs.j2 b/docker-sonic-alpinevs/copp_cfg_alpinevs.j2 index 9bf39db..18e3076 100644 --- a/docker-sonic-alpinevs/copp_cfg_alpinevs.j2 +++ b/docker-sonic-alpinevs/copp_cfg_alpinevs.j2 @@ -33,148 +33,244 @@ "queue": "7" }, "trap.group.cpu.queue.0": { - "queue": "0" + "queue": "0", + "genetlink_name" : "genl_packet_q0", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.1": { - "queue": "1" + "queue": "1", + "genetlink_name" : "genl_packet_q1", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.2": { - "queue": "2" + "queue": "2", + "genetlink_name" : "genl_packet_q2", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.3": { - "queue": "3" + "queue": "3", + "genetlink_name" : "genl_packet_q3", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.4": { - "queue": "4" + "queue": "4", + "genetlink_name" : "genl_packet_q4", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.5": { - "queue": "5" + "queue": "5", + "genetlink_name" : "genl_packet_q5", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.6": { - "queue": "6" + "queue": "6", + "genetlink_name" : "genl_packet_q6", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.7": { - "queue": "7" + "queue": "7", + "genetlink_name" : "genl_packet_q7", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.8": { - "queue": "8" + "queue": "8", + "genetlink_name" : "genl_packet_q8", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.9": { - "queue": "9" + "queue": "9", + "genetlink_name" : "genl_packet_q9", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.10": { - "queue": "10" + "queue": "10", + "genetlink_name" : "genl_packet_q10", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.11": { - "queue": "11" + "queue": "11", + "genetlink_name" : "genl_packet_q11", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.12": { - "queue": "12" + "queue": "12", + "genetlink_name" : "genl_packet_q12", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.13": { - "queue": "13" + "queue": "13", + "genetlink_name" : "genl_packet_q13", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.14": { - "queue": "14" + "queue": "14", + "genetlink_name" : "genl_packet_q14", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.15": { - "queue": "15" + "queue": "15", + "genetlink_name" : "genl_packet_q15", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.16": { - "queue": "16" + "queue": "16", + "genetlink_name" : "genl_packet_q16", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.17": { - "queue": "17" + "queue": "17", + "genetlink_name" : "genl_packet_q17", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.18": { - "queue": "18" + "queue": "18", + "genetlink_name" : "genl_packet_q18", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.19": { - "queue": "19" + "queue": "19", + "genetlink_name" : "genl_packet_q19", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.20": { - "queue": "20" + "queue": "20", + "genetlink_name" : "genl_packet_q20", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.21": { - "queue": "21" + "queue": "21", + "genetlink_name" : "genl_packet_q21", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.22": { - "queue": "22" + "queue": "22", + "genetlink_name" : "genl_packet_q22", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.23": { - "queue": "23" + "queue": "23", + "genetlink_name" : "genl_packet_q23", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.24": { - "queue": "24" + "queue": "24", + "genetlink_name" : "genl_packet_q24", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.25": { - "queue": "25" + "queue": "25", + "genetlink_name" : "genl_packet_q25", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.26": { - "queue": "26" + "queue": "26", + "genetlink_name" : "genl_packet_q26", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.27": { - "queue": "27" + "queue": "27", + "genetlink_name" : "genl_packet_q27", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.28": { - "queue": "28" + "queue": "28", + "genetlink_name" : "genl_packet_q28", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.29": { - "queue": "29" + "queue": "29", + "genetlink_name" : "genl_packet_q29", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.30": { - "queue": "30" + "queue": "30", + "genetlink_name" : "genl_packet_q30", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.31": { - "queue": "31" + "queue": "31", + "genetlink_name" : "genl_packet_q31", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.32": { - "queue": "32" + "queue": "32", + "genetlink_name" : "genl_packet_q32", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.33": { - "queue": "33" + "queue": "33", + "genetlink_name" : "genl_packet_q33", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.34": { - "queue": "34" + "queue": "34", + "genetlink_name" : "genl_packet_q34", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.35": { - "queue": "35" + "queue": "35", + "genetlink_name" : "genl_packet_q35", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.36": { - "queue": "36" + "queue": "36", + "genetlink_name" : "genl_packet_q36", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.37": { - "queue": "37" + "queue": "37", + "genetlink_name" : "genl_packet_q37", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.38": { - "queue": "38" + "queue": "38", + "genetlink_name" : "genl_packet_q38", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.39": { - "queue": "39" + "queue": "39", + "genetlink_name" : "genl_packet_q39", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.40": { - "queue": "40" + "queue": "40", + "genetlink_name" : "genl_packet_q40", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.41": { - "queue": "41" + "queue": "41", + "genetlink_name" : "genl_packet_q41", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.42": { - "queue": "42" + "queue": "42", + "genetlink_name" : "genl_packet_q42", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.43": { - "queue": "43" + "queue": "43", + "genetlink_name" : "genl_packet_q43", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.44": { - "queue": "44" + "queue": "44", + "genetlink_name" : "genl_packet_q44", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.45": { - "queue": "45" + "queue": "45", + "genetlink_name" : "genl_packet_q45", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.46": { - "queue": "46" + "queue": "46", + "genetlink_name" : "genl_packet_q46", + "genetlink_mcgrp_name" : "packets" }, "trap.group.cpu.queue.47": { - "queue": "47" + "queue": "47", + "genetlink_name" : "genl_packet_q47", + "genetlink_mcgrp_name" : "packets" } }, "COPP_TRAP": { diff --git a/docker-sonic-alpinevs/start.sh b/docker-sonic-alpinevs/start.sh index 1d7ec4d..21a5de7 100755 --- a/docker-sonic-alpinevs/start.sh +++ b/docker-sonic-alpinevs/start.sh @@ -24,12 +24,13 @@ if [[ -f /usr/share/sonic/virtual_chassis/default_config.json ]]; then mv /tmp/init_cfg.json /etc/sonic/init_cfg.json fi -if [ -f /etc/sonic/config_db.json ]; then +if [ -f /mnt/sonic/config_db.json ]; then + cp /mnt/sonic/config_db.json /etc/sonic/config_db.json # Merge basic system init properties into config_db.json sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --print-data > /tmp/config_db.json mv /tmp/config_db.json /etc/sonic/config_db.json echo "Using existing config_db.json" -else +elif [ ! -f /etc/sonic/config_db.json ]; then echo "ERROR: /etc/sonic/config_db.json is missing! Cannot initialize system." exit 1 fi diff --git a/src/deploy/kne/twodut-docker-alpinevs.txt b/src/deploy/kne/twodut-docker-alpinevs.txt index 28f1c79..5fcc7e4 100644 --- a/src/deploy/kne/twodut-docker-alpinevs.txt +++ b/src/deploy/kne/twodut-docker-alpinevs.txt @@ -17,6 +17,9 @@ nodes: { } } } + config_path: "/mnt/sonic" + config_file: "config_db.json" + file: "config_db_alpine_vs.json" } services:{ key: 22 @@ -60,6 +63,9 @@ nodes: { } } } + config_path: "/mnt/sonic" + config_file: "config_db.json" + file: "config_db_alpine_vs.json" } services:{ key: 22