[VOL-1638][BAL3.0 Brigade] tcont/gem creation and scheduler
[VOL-1672][BAL3.0 Brigade] BAL v3.0 removed inner_TPID and outer_TPID
[VOL-1673][BAL3.0 Brigade] Create scheduler with addition parameter for BAL 3.0
Change-Id: I1aa6c92e2eb6596f7f9f61ac6d38a651bf2a3929
diff --git a/agent/common/core.h b/agent/common/core.h
index 1fd3767..8632b5b 100644
--- a/agent/common/core.h
+++ b/agent/common/core.h
@@ -24,15 +24,54 @@
#include "state.h"
+#define NONE "\033[m"
+#define LIGHT_RED "\033[1;31m"
+#define BROWN "\033[0;33m"
+#define LIGHT_GREEN "\033[1;32m"
+#define OPENOLT_LOG(level, id, fmt, ...) \
+ if (DEV_LOG_LEVEL_##level == DEV_LOG_LEVEL_ERROR) \
+ BCM_LOG(level, id, "%s" fmt "%s", LIGHT_RED, ##__VA_ARGS__, NONE); \
+ else if (DEV_LOG_LEVEL_##level == DEV_LOG_LEVEL_INFO) \
+ BCM_LOG(level, id, "%s" fmt "%s", NONE, ##__VA_ARGS__, NONE); \
+ else if (DEV_LOG_LEVEL_##level == DEV_LOG_LEVEL_WARNING) \
+ BCM_LOG(level, id, "%s" fmt "%s", BROWN, ##__VA_ARGS__, NONE); \
+ else if (DEV_LOG_LEVEL_##level == DEV_LOG_LEVEL_DEBUG) \
+ BCM_LOG(level, id, "%s" fmt "%s", LIGHT_GREEN, ##__VA_ARGS__, NONE); \
+ else \
+ BCM_LOG(INFO, id, fmt, ##__VA_ARGS__);
+
#define COLLECTION_PERIOD 15
extern State state;
enum FLOW_CFG {
- INTF_TYPE = 0,
- INTF_ID = 1,
- SVC_PORT_ID = 2,
- COOKIE = 3
+ ONU_ID = 0,
+ FLOW_TYPE = 1,
+ SVC_PORT_ID = 2,
+ PRIORITY = 3,
+ COOKIE = 4,
+ INGRESS_INTF_TYPE= 5,
+ EGRESS_INTF_TYPE= 6,
+ INGRESS_INTF_ID = 7,
+ EGRESS_INTF_ID = 8,
+ CLASSIFIER_O_VID = 9,
+ CLASSIFIER_O_PBITS = 10,
+ CLASSIFIER_I_VID = 11,
+ CLASSIFIER_I_PBITS = 12,
+ CLASSIFIER_ETHER_TYPE = 13,
+ CLASSIFIER_IP_PROTO =14,
+ CLASSIFIER_SRC_PORT = 15,
+ CLASSIFIER_DST_PORT = 16,
+ CLASSIFIER_PKT_TAG_TYPE = 17,
+ EGRESS_QOS_TYPE = 18,
+ EGRESS_QOS_QUEUE_ID = 19,
+ EGRESS_QOS_TM_SCHED_ID = 20,
+ ACTION_CMDS_BITMASK = 21,
+ ACTION_O_VID = 22,
+ ACTION_O_PBITS = 23,
+ ACTION_I_VID = 24,
+ ACTION_I_PBITS = 25,
+ STATE = 26
};
Status Enable_(int argc, char *argv[]);
@@ -44,8 +83,7 @@
const char *vendor_id, const char *vendor_specific);
Status EnablePonIf_(uint32_t intf_id);
Status DisablePonIf_(uint32_t intf_id);
-Status EnableUplinkIf_(uint32_t intf_id);
-Status DisableUplinkIf_(uint32_t intf_id);
+Status SetStateUplinkIf_(uint32_t intf_id, bool set_state);
unsigned NumNniIf_();
unsigned NumPonIf_();
Status OmciMsgOut_(uint32_t intf_id, uint32_t onu_id, const std::string pkt);
@@ -71,7 +109,7 @@
int get_status_bcm_cli_quit(void);
uint16_t get_dev_id(void);
Status pushOltOperInd(uint32_t intf_id, const char *type, const char *state);
-uint64_t get_flow_status(uint16_t flow_id, uint16_t data_id);
+uint64_t get_flow_status(uint16_t flow_id, uint16_t flow_type, uint16_t data_id);
void stats_collection();
#endif