Restructuring netflow protocol
Changed netflow structure from
//apps/netflow to //apps/ipflow-monitor/netflow
Change-Id: I11722b2c68105137306755e890da0dd8ba7245df
diff --git a/apps/netflow/BUILD b/apps/ipflow-monitor/netflow/BUILD
similarity index 62%
rename from apps/netflow/BUILD
rename to apps/ipflow-monitor/netflow/BUILD
index 44a572b..51f149e 100644
--- a/apps/netflow/BUILD
+++ b/apps/ipflow-monitor/netflow/BUILD
@@ -1,6 +1,6 @@
BUNDLES = [
- "//apps/netflow/api:onos-apps-netflow-api",
- "//apps/netflow/app:onos-apps-netflow-app",
+ "//apps/ipflow-monitor/netflow/api:onos-apps-ipflow-monitor-netflow-api",
+ "//apps/ipflow-monitor/netflow/app:onos-apps-ipflow-monitor-netflow-app",
]
onos_app(
diff --git a/apps/netflow/api/BUILD b/apps/ipflow-monitor/netflow/api/BUILD
similarity index 100%
rename from apps/netflow/api/BUILD
rename to apps/ipflow-monitor/netflow/api/BUILD
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/DataDeserializer.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataDeserializer.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/DataDeserializer.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataDeserializer.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/DataFlowRecord.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataFlowRecord.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/DataFlowRecord.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataFlowRecord.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/DataFlowSet.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataFlowSet.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/DataFlowSet.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataFlowSet.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/DataRecord.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataRecord.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/DataRecord.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataRecord.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/DataTemplateRecord.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataTemplateRecord.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/DataTemplateRecord.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/DataTemplateRecord.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/Flow.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/Flow.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/Flow.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/Flow.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/FlowField.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowField.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/FlowField.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowField.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/FlowRecord.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowRecord.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/FlowRecord.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowRecord.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/FlowSet.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowSet.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/FlowSet.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowSet.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/FlowTemplateField.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowTemplateField.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/FlowTemplateField.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/FlowTemplateField.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/NetflowController.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/NetflowController.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/NetflowController.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/NetflowController.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/NetflowStore.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/NetflowStore.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/NetflowStore.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/NetflowStore.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/NetflowUtils.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/NetflowUtils.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/NetflowUtils.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/NetflowUtils.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/OptionalTemplateFlowSet.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/OptionalTemplateFlowSet.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/OptionalTemplateFlowSet.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/OptionalTemplateFlowSet.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/SourceId.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/SourceId.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/SourceId.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/SourceId.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/TemplateFlowSet.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/TemplateFlowSet.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/TemplateFlowSet.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/TemplateFlowSet.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/TemplateId.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/TemplateId.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/TemplateId.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/TemplateId.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/TemplateRecord.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/TemplateRecord.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/TemplateRecord.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/TemplateRecord.java
diff --git a/apps/netflow/api/src/main/java/org/onosproject/netflow/package-info.java b/apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/package-info.java
similarity index 100%
rename from apps/netflow/api/src/main/java/org/onosproject/netflow/package-info.java
rename to apps/ipflow-monitor/netflow/api/src/main/java/org/onosproject/netflow/package-info.java
diff --git a/apps/netflow/app/BUILD b/apps/ipflow-monitor/netflow/app/BUILD
similarity index 76%
rename from apps/netflow/app/BUILD
rename to apps/ipflow-monitor/netflow/app/BUILD
index c1a4601..0e6c0ee 100644
--- a/apps/netflow/app/BUILD
+++ b/apps/ipflow-monitor/netflow/app/BUILD
@@ -1,6 +1,6 @@
COMPILE_DEPS = CORE_DEPS + KRYO + CLI + [
"//core/store/serializers:onos-core-serializers",
- "//apps/netflow/api:onos-apps-netflow-api",
+ "//apps/ipflow-monitor/netflow/api:onos-apps-ipflow-monitor-netflow-api",
"@io_netty_netty_common//jar",
"@io_netty_netty//jar",
]
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/cli/FlowFieldCompleter.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/FlowFieldCompleter.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/cli/FlowFieldCompleter.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/FlowFieldCompleter.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowDataflowCommand.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowDataflowCommand.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowDataflowCommand.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowDataflowCommand.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowSummaryCommand.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowSummaryCommand.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowSummaryCommand.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowSummaryCommand.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTemplateCommand.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTemplateCommand.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTemplateCommand.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTemplateCommand.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficFilterCommand.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficFilterCommand.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficFilterCommand.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficFilterCommand.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficSummaryCommand.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficSummaryCommand.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficSummaryCommand.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/NetflowTrafficSummaryCommand.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/cli/package-info.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/package-info.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/cli/package-info.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/cli/package-info.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/Controller.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/Controller.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/Controller.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/Controller.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/DistributedNetflowStore.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/DistributedNetflowStore.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/DistributedNetflowStore.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/DistributedNetflowStore.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NeflowChannelHandler.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NeflowChannelHandler.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NeflowChannelHandler.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NeflowChannelHandler.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetFlowPacket.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetFlowPacket.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetFlowPacket.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetFlowPacket.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowControllerImpl.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowControllerImpl.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowControllerImpl.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowControllerImpl.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowMessageDecoder.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowMessageDecoder.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowMessageDecoder.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowMessageDecoder.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowPipelineFactory.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowPipelineFactory.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowPipelineFactory.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/NetflowPipelineFactory.java
diff --git a/apps/netflow/app/src/main/java/org/onosproject/netflow/impl/package-info.java b/apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/package-info.java
similarity index 100%
rename from apps/netflow/app/src/main/java/org/onosproject/netflow/impl/package-info.java
rename to apps/ipflow-monitor/netflow/app/src/main/java/org/onosproject/netflow/impl/package-info.java
diff --git a/apps/ipflow-monitor/netflow/placeholder b/apps/ipflow-monitor/netflow/placeholder
deleted file mode 100644
index e69de29..0000000
--- a/apps/ipflow-monitor/netflow/placeholder
+++ /dev/null
diff --git a/tools/build/bazel/modules.bzl b/tools/build/bazel/modules.bzl
index b6bde50..ce5cca2 100644
--- a/tools/build/bazel/modules.bzl
+++ b/tools/build/bazel/modules.bzl
@@ -222,7 +222,7 @@
"//apps/mfwd:onos-apps-mfwd-oar": [],
"//apps/mlb:onos-apps-mlb-oar": ["sdfabric"],
"//apps/mobility:onos-apps-mobility-oar": [],
- "//apps/netflow:onos-apps-netflow-oar": [],
+ "//apps/ipflow-monitor/netflow:onos-apps-ipflow-monitor-netflow-oar": [],
"//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar": [],
"//apps/newoptical:onos-apps-newoptical-oar": [],
"//apps/nodemetrics:onos-apps-nodemetrics-oar": [],