Merge branch 'master' into p4orch_1

Author: prsunny

lib/orch_zmq_config.cpp

@@ -0,0 +1,37 @@
+#include <iostream>
+#include <fstream>
+
+#include "orch_zmq_config.h"
+
+#define ZMQ_TABLE_CONFIGFILE       "/etc/swss/orch_zmq_tables.conf"
+
+std::set<std::string> swss::load_zmq_tables()
+{
+    std::set<std::string> tables;
+    std::ifstream config_file(ZMQ_TABLE_CONFIGFILE);
+    if (config_file.is_open())
+    {
+        std::string table;
+        while (std::getline(config_file, table))
+        {
+            tables.emplace(table);
+        }
+        config_file.close();
+    }
+
+    return tables;
+}
+
+
+std::shared_ptr<swss::ZmqClient> swss::create_zmq_client(std::string zmq_address)
+{
+    // swssconfig running inside swss contianer, so need get ZMQ port according to namespace ID.
+    auto zmq_port = ORCH_ZMQ_PORT;
+    if (const char* nsid = std::getenv("NAMESPACE_ID"))
+    {
+        // namespace start from 0, using original ZMQ port for global namespace
+        zmq_port += atoi(nsid) + 1;
+    }
+
+    return std::make_shared<ZmqClient>(zmq_address + ":" + std::to_string(zmq_port));
+}

lib/orch_zmq_config.h

@@ -0,0 +1,23 @@
+#ifndef SWSS_ORCH_ZMQ_CONFIG_H
+#define SWSS_ORCH_ZMQ_CONFIG_H
+
+#include <string.h>
+#include <set>
+
+#include "dbconnector.h"
+#include "zmqclient.h"
+
+/*
+ * swssconfig will only connect to local orchagent ZMQ endpoint.
+ */
+#define ZMQ_LOCAL_ADDRESS               "tcp://localhost"
+
+namespace swss {
+
+std::set<std::string> load_zmq_tables();
+
+std::shared_ptr<ZmqClient> create_zmq_client(std::string zmq_address);
+
+}
+
+#endif /* SWSS_ORCH_ZMQ_CONFIG_H */

orchagent/Makefile.am

@@ -114,6 +114,7 @@ orchagent_SOURCES = \
             dash/dashvnetorch.cpp \
             dash/dashaclorch.cpp \
             dash/dashaclgroupmgr.cpp \
+            dash/dashmeterorch.cpp \
             dash/dashtagmgr.cpp \
             dash/dashtunnelorch.cpp \
             dash/pbutils.cpp \

orchagent/bulker.h

@@ -382,6 +382,18 @@ struct SaiBulkerTraits<sai_neighbor_api_t>
     using bulk_set_entry_attribute_fn = sai_bulk_set_neighbor_entry_attribute_fn;
 };
 
+template<>
+struct SaiBulkerTraits<sai_dash_meter_api_t>
+{
+    using entry_t = sai_object_id_t;
+    using api_t = sai_dash_meter_api_t;
+    using create_entry_fn = sai_create_meter_rule_fn;
+    using remove_entry_fn = sai_remove_meter_rule_fn;
+    using set_entry_attribute_fn = sai_set_meter_rule_attribute_fn;
+    using bulk_create_entry_fn = sai_bulk_object_create_fn;
+    using bulk_remove_entry_fn = sai_bulk_object_remove_fn;
+};
+
 template<>
 struct SaiBulkerTraits<sai_dash_vnet_api_t>
 {
@@ -1274,6 +1286,15 @@ inline ObjectBulker<sai_dash_vnet_api_t>::ObjectBulker(SaiBulkerTraits<sai_dash_
     remove_entries = api->remove_vnets;
 }
 
+template <>
+inline ObjectBulker<sai_dash_meter_api_t>::ObjectBulker(SaiBulkerTraits<sai_dash_meter_api_t>::api_t *api, sai_object_id_t switch_id, size_t max_bulk_size) :
+    switch_id(switch_id),
+    max_bulk_size(max_bulk_size)
+{
+    create_entries = api->create_meter_rules;
+    remove_entries = api->remove_meter_rules;
+}
+
 template <>
 inline ObjectBulker<sai_dash_tunnel_api_t>::ObjectBulker(SaiBulkerTraits<sai_dash_tunnel_api_t>::api_t *api, sai_object_id_t switch_id, size_t max_bulk_size, sai_object_type_extensions_t object_type) :
     switch_id(switch_id),

orchagent/crmorch.cpp

@@ -64,6 +64,10 @@ const map<CrmResourceType, string> crmResTypeNameMap =
     { CrmResourceType::CRM_DASH_IPV6_ACL_GROUP, "DASH_IPV6_ACL_GROUP" },
     { CrmResourceType::CRM_DASH_IPV4_ACL_RULE, "DASH_IPV4_ACL_RULE" },
     { CrmResourceType::CRM_DASH_IPV6_ACL_RULE, "DASH_IPV6_ACL_RULE" },
+    { CrmResourceType::CRM_DASH_IPV4_METER_POLICY, "DASH_IPV4_METER_POLICY" },
+    { CrmResourceType::CRM_DASH_IPV4_METER_RULE, "DASH_IPV4_METER_RULE" },
+    { CrmResourceType::CRM_DASH_IPV6_METER_POLICY, "DASH_IPV6_METER_POLICY" },
+    { CrmResourceType::CRM_DASH_IPV6_METER_RULE, "DASH_IPV6_METER_RULE" },
     { CrmResourceType::CRM_TWAMP_ENTRY, "TWAMP_ENTRY" }
 };
 
@@ -127,6 +131,10 @@ const map<CrmResourceType, sai_object_type_t> crmResSaiObjAttrMap =
     { CrmResourceType::CRM_DASH_IPV6_ACL_GROUP, (sai_object_type_t)SAI_OBJECT_TYPE_DASH_ACL_GROUP },
     { CrmResourceType::CRM_DASH_IPV4_ACL_RULE, (sai_object_type_t)SAI_OBJECT_TYPE_DASH_ACL_RULE },
     { CrmResourceType::CRM_DASH_IPV6_ACL_RULE, (sai_object_type_t)SAI_OBJECT_TYPE_DASH_ACL_RULE },
+    { CrmResourceType::CRM_DASH_IPV4_METER_POLICY, (sai_object_type_t)SAI_OBJECT_TYPE_METER_POLICY },
+    { CrmResourceType::CRM_DASH_IPV6_METER_POLICY, (sai_object_type_t)SAI_OBJECT_TYPE_METER_POLICY },
+    { CrmResourceType::CRM_DASH_IPV4_METER_RULE, (sai_object_type_t)SAI_OBJECT_TYPE_METER_RULE },
+    { CrmResourceType::CRM_DASH_IPV6_METER_RULE, (sai_object_type_t)SAI_OBJECT_TYPE_METER_RULE },
     { CrmResourceType::CRM_TWAMP_ENTRY, SAI_OBJECT_TYPE_NULL }
 };
 
@@ -189,6 +197,10 @@ const map<string, CrmResourceType> crmThreshTypeResMap =
     { "dash_ipv6_acl_group_threshold_type", CrmResourceType::CRM_DASH_IPV6_ACL_GROUP },
     { "dash_ipv4_acl_rule_threshold_type", CrmResourceType::CRM_DASH_IPV4_ACL_RULE },
     { "dash_ipv6_acl_rule_threshold_type", CrmResourceType::CRM_DASH_IPV6_ACL_RULE },
+    { "dash_ipv4_meter_policy_threshold_type", CrmResourceType::CRM_DASH_IPV4_METER_POLICY },
+    { "dash_ipv6_meter_policy_threshold_type", CrmResourceType::CRM_DASH_IPV6_METER_POLICY },
+    { "dash_ipv4_meter_rule_threshold_type", CrmResourceType::CRM_DASH_IPV4_METER_RULE },
+    { "dash_ipv6_meter_rule_threshold_type", CrmResourceType::CRM_DASH_IPV6_METER_RULE },
     { "twamp_entry_threshold_type", CrmResourceType::CRM_TWAMP_ENTRY }
 };
 
@@ -231,6 +243,10 @@ const map<string, CrmResourceType> crmThreshLowResMap =
     { "dash_ipv6_acl_group_low_threshold", CrmResourceType::CRM_DASH_IPV6_ACL_GROUP },
     { "dash_ipv4_acl_rule_low_threshold", CrmResourceType::CRM_DASH_IPV4_ACL_RULE },
     { "dash_ipv6_acl_rule_low_threshold", CrmResourceType::CRM_DASH_IPV6_ACL_RULE },
+    { "dash_ipv4_meter_policy_low_threshold", CrmResourceType::CRM_DASH_IPV4_METER_POLICY },
+    { "dash_ipv6_meter_policy_low_threshold", CrmResourceType::CRM_DASH_IPV6_METER_POLICY },
+    { "dash_ipv4_meter_rule_low_threshold", CrmResourceType::CRM_DASH_IPV4_METER_RULE },
+    { "dash_ipv6_meter_rule_low_threshold", CrmResourceType::CRM_DASH_IPV6_METER_RULE },
     { "twamp_entry_low_threshold", CrmResourceType::CRM_TWAMP_ENTRY }
 };
 
@@ -273,6 +289,10 @@ const map<string, CrmResourceType> crmThreshHighResMap =
     { "dash_ipv6_acl_group_high_threshold", CrmResourceType::CRM_DASH_IPV6_ACL_GROUP },
     { "dash_ipv4_acl_rule_high_threshold", CrmResourceType::CRM_DASH_IPV4_ACL_RULE },
     { "dash_ipv6_acl_rule_high_threshold", CrmResourceType::CRM_DASH_IPV6_ACL_RULE },
+    { "dash_ipv4_meter_policy_high_threshold", CrmResourceType::CRM_DASH_IPV4_METER_POLICY },
+    { "dash_ipv6_meter_policy_high_threshold", CrmResourceType::CRM_DASH_IPV6_METER_POLICY },
+    { "dash_ipv4_meter_rule_high_threshold", CrmResourceType::CRM_DASH_IPV4_METER_RULE },
+    { "dash_ipv6_meter_rule_high_threshold", CrmResourceType::CRM_DASH_IPV6_METER_RULE },
     { "twamp_entry_high_threshold", CrmResourceType::CRM_TWAMP_ENTRY }
 };
 
@@ -322,6 +342,10 @@ const map<string, CrmResourceType> crmAvailCntsTableMap =
     { "crm_stats_dash_ipv6_acl_group_available", CrmResourceType::CRM_DASH_IPV6_ACL_GROUP },
     { "crm_stats_dash_ipv4_acl_rule_available", CrmResourceType::CRM_DASH_IPV4_ACL_RULE },
     { "crm_stats_dash_ipv6_acl_rule_available", CrmResourceType::CRM_DASH_IPV6_ACL_RULE },
+    { "crm_stats_dash_ipv4_meter_policy_available", CrmResourceType::CRM_DASH_IPV4_METER_POLICY },
+    { "crm_stats_dash_ipv6_meter_policy_available", CrmResourceType::CRM_DASH_IPV6_METER_POLICY },
+    { "crm_stats_dash_ipv4_meter_rule_available", CrmResourceType::CRM_DASH_IPV4_METER_RULE },
+    { "crm_stats_dash_ipv6_meter_rule_available", CrmResourceType::CRM_DASH_IPV6_METER_RULE },
     { "crm_stats_twamp_entry_available", CrmResourceType::CRM_TWAMP_ENTRY }
 };
 
@@ -364,6 +388,10 @@ const map<string, CrmResourceType> crmUsedCntsTableMap =
     { "crm_stats_dash_ipv6_acl_group_used", CrmResourceType::CRM_DASH_IPV6_ACL_GROUP },
     { "crm_stats_dash_ipv4_acl_rule_used", CrmResourceType::CRM_DASH_IPV4_ACL_RULE },
     { "crm_stats_dash_ipv6_acl_rule_used", CrmResourceType::CRM_DASH_IPV6_ACL_RULE },
+    { "crm_stats_dash_ipv4_meter_policy_used", CrmResourceType::CRM_DASH_IPV4_METER_POLICY },
+    { "crm_stats_dash_ipv6_meter_policy_used", CrmResourceType::CRM_DASH_IPV6_METER_POLICY },
+    { "crm_stats_dash_ipv4_meter_rule_used", CrmResourceType::CRM_DASH_IPV4_METER_RULE },
+    { "crm_stats_dash_ipv6_meter_rule_used", CrmResourceType::CRM_DASH_IPV6_METER_RULE },
     { "crm_stats_twamp_entry_used", CrmResourceType::CRM_TWAMP_ENTRY },
 };
 
@@ -891,6 +919,10 @@ void CrmOrch::getResAvailableCounters()
             case CrmResourceType::CRM_DASH_IPV6_INBOUND_ROUTING:
             case CrmResourceType::CRM_DASH_IPV4_OUTBOUND_ROUTING:
             case CrmResourceType::CRM_DASH_IPV6_OUTBOUND_ROUTING:
+            case CrmResourceType::CRM_DASH_IPV4_METER_POLICY:
+            case CrmResourceType::CRM_DASH_IPV6_METER_POLICY:
+            case CrmResourceType::CRM_DASH_IPV4_METER_RULE:
+            case CrmResourceType::CRM_DASH_IPV6_METER_RULE:
             case CrmResourceType::CRM_DASH_IPV4_PA_VALIDATION:
             case CrmResourceType::CRM_DASH_IPV6_PA_VALIDATION:
             case CrmResourceType::CRM_DASH_IPV4_OUTBOUND_CA_TO_PA:

orchagent/crmorch.h

@@ -50,6 +50,10 @@ enum class CrmResourceType
     CRM_DASH_IPV6_ACL_GROUP,
     CRM_DASH_IPV4_ACL_RULE,
     CRM_DASH_IPV6_ACL_RULE,
+    CRM_DASH_IPV4_METER_POLICY,
+    CRM_DASH_IPV6_METER_POLICY,
+    CRM_DASH_IPV4_METER_RULE,
+    CRM_DASH_IPV6_METER_RULE,
     CRM_TWAMP_ENTRY
 };