Renamed fabric-hw to fabric-pro for consistency with other private modules
Change-Id: I93d2be4b474e42d8c764de9b3502e2f0e9f3c15f
diff --git a/mwc.defs b/mwc.defs
index 533b169..26017d4 100644
--- a/mwc.defs
+++ b/mwc.defs
@@ -1,7 +1,7 @@
include_defs('//modules.defs')
MWC_APPS = [
- '//pipelines/fabric-hw:onos-pipelines-fabric-hw-oar',
+ '//pipelines/fabric-pro:onos-pipelines-fabric-pro-oar',
]
APPS = APPS + MWC_APPS
diff --git a/pipelines/fabric-hw/BUCK b/pipelines/fabric-pro/BUCK
similarity index 75%
rename from pipelines/fabric-hw/BUCK
rename to pipelines/fabric-pro/BUCK
index d6b3978..da58b20 100644
--- a/pipelines/fabric-hw/BUCK
+++ b/pipelines/fabric-pro/BUCK
@@ -13,7 +13,7 @@
]
BUNDLES = [
- '//pipelines/fabric-hw:onos-pipelines-fabric-hw',
+ '//pipelines/fabric-pro:onos-pipelines-fabric-pro',
]
osgi_jar_with_tests (
@@ -22,11 +22,11 @@
)
onos_app(
- app_name = 'org.onosproject.pipelines.fabric-hw',
- title = 'Fabric Pipeline',
+ app_name = 'org.onosproject.pipelines.fabric-pro',
+ title = 'Fabric Pipeline PRO',
category = 'Pipeline',
url = 'http://onosproject.org',
- description = 'Provides CORD fabric pipelines for HW P4-enabled switches',
+ description = 'Provides CORD fabric pipelines for P4-enabled switches',
included_bundles = BUNDLES,
required_apps = [
'org.onosproject.drivers.p4runtime',
diff --git a/pipelines/fabric-hw/src/main/java/org/onosproject/pipelines/fabric/hw/HwPipeconfLoader.java b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
similarity index 98%
rename from pipelines/fabric-hw/src/main/java/org/onosproject/pipelines/fabric/hw/HwPipeconfLoader.java
rename to pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
index 05e03e6..2bb9123 100644
--- a/pipelines/fabric-hw/src/main/java/org/onosproject/pipelines/fabric/hw/HwPipeconfLoader.java
+++ b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/HwPipeconfLoader.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onosproject.pipelines.fabric.hw;
+package org.onosproject.pipelines.fabric.pro;
import com.google.common.collect.ImmutableList;
import org.apache.felix.scr.annotations.Activate;
diff --git a/pipelines/fabric-hw/src/main/java/org/onosproject/pipelines/fabric/hw/package-info.java b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/package-info.java
similarity index 93%
rename from pipelines/fabric-hw/src/main/java/org/onosproject/pipelines/fabric/hw/package-info.java
rename to pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/package-info.java
index 361cdd3..f84fec4 100644
--- a/pipelines/fabric-hw/src/main/java/org/onosproject/pipelines/fabric/hw/package-info.java
+++ b/pipelines/fabric-pro/src/main/java/org/onosproject/pipelines/fabric/pro/package-info.java
@@ -17,4 +17,4 @@
/**
* CORD underlay fabric pipeline for P4 hardware switches.
*/
-package org.onosproject.pipelines.fabric.hw;
+package org.onosproject.pipelines.fabric.pro;
diff --git a/pipelines/fabric-hw/src/main/resources/Makefile b/pipelines/fabric-pro/src/main/resources/Makefile
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/Makefile
rename to pipelines/fabric-pro/src/main/resources/Makefile
diff --git a/pipelines/fabric-hw/src/main/resources/main.p4 b/pipelines/fabric-pro/src/main/resources/main.p4
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/main.p4
rename to pipelines/fabric-pro/src/main/resources/main.p4
diff --git a/pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/context.json
diff --git a/pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/fabric.p4info
diff --git a/pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/mavericks/tofino.bin
Binary files differ
diff --git a/pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/montana/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/montana/context.json
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
diff --git a/pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/fabric.p4info
diff --git a/pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin
similarity index 100%
rename from pipelines/fabric-hw/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin
rename to pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/tofino.bin
Binary files differ