Little refactor of BNG integration and new bng-api version
Change-Id: Id06008f4f0888e8e81c134a368e3c5ea54291a5d
diff --git a/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java b/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java
index e7cffd8..e20ecbb 100644
--- a/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java
+++ b/src/main/java/org/opencord/kafka/integrations/BngStatsKafkaIntegration.java
@@ -46,12 +46,22 @@
@Component(immediate = true)
public class BngStatsKafkaIntegration extends AbstractKafkaIntegration {
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected EventBusService eventBusService;
+
+ @Reference(cardinality = ReferenceCardinality.OPTIONAL,
+ policy = ReferencePolicy.DYNAMIC,
+ bind = "bindBngStatsService",
+ unbind = "unbindBngStatsService")
+ protected volatile BngStatsService ignore;
+ private final AtomicReference<BngStatsService> bngStatsServiceRef = new AtomicReference<>();
+
private static final String TOPIC_STATS = "bng.stats";
private static final String SUBSCRIBER_S_TAG = "sTag";
private static final String SUBSCRIBER_C_TAG = "cTag";
- private static final String UP_TX_BYTES = "upTermBytes";
- private static final String UP_TX_PACKETS = "upTermPackets";
+ private static final String UP_TX_BYTES = "upTxBytes";
+ private static final String UP_TX_PACKETS = "upTxPackets";
private static final String UP_RX_BYTES = "upRxBytes";
private static final String UP_RX_PACKETS = "upRxPackets";
@@ -92,18 +102,6 @@
private final BngStatsEventListener statsListener = new InternalStatsListener();
- private final AtomicReference<BngStatsService> bngStatsServiceRef = new AtomicReference<>();
-
- @Reference(cardinality = ReferenceCardinality.OPTIONAL,
- policy = ReferencePolicy.DYNAMIC,
- bind = "bindBngStatsService",
- unbind = "unbindBngStatsService")
- protected volatile BngStatsService bngStatsService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
- protected EventBusService eventBusService;
-
-
protected void bindBngStatsService(BngStatsService incomingService) {
bindAndAddListener(incomingService, bngStatsServiceRef, statsListener);
}