Refactor of CFM code part 4 - Microsemi driver - updating modules.deps with the move of the driver code
previously:
Refactor of CFM code part3 - Microsemi driver: moved everything out of drivers/microsemi to /drivers/microsemi/ea1000 to make room for future drivers
Refactor of CFM code part2 - API: moved everything from incubator/*/src/main/java/org/onosproject/incubator/net/l2monitoring to apps/cfm/*/src/main/java/org/onosproject/incubator/net/l2monitoring - this means that services belonging to l2 monitoring will now only be loaded when cfm app is started
Refactor of CFM code part1 - NBI: moves the CLI and REST part of the app down a level to an nbi folder for a more consistent approach with other modules
Change-Id: I62e0bc40c505433319fd6705e964430ad2208d33
diff --git a/drivers/microsemi/BUCK b/drivers/microsemi/BUCK
deleted file mode 100644
index e4040e6..0000000
--- a/drivers/microsemi/BUCK
+++ /dev/null
@@ -1,22 +0,0 @@
-COMPILE_DEPS = [
- '//lib:CORE_DEPS',
-]
-
-TEST_DEPS = [
- '//lib:TEST_ADAPTERS',
-]
-
-#This is just a dummy placeholder while the code is being moved.
-osgi_jar_with_tests (
- deps = COMPILE_DEPS,
- test_deps = TEST_DEPS,
-)
-
-onos_app (
- app_name = 'org.onosproject.drivers.microsemi',
- title = 'Microsemi Drivers',
- category = 'Drivers',
- url = 'http://onosproject.org',
- description = 'A dummy placeholder while code is being moved.',
- required_apps = APPS,
-)
\ No newline at end of file
diff --git a/drivers/microsemi/README.md b/drivers/microsemi/README.md
new file mode 100644
index 0000000..7a29a1d
--- /dev/null
+++ b/drivers/microsemi/README.md
@@ -0,0 +1,4 @@
+There is no BUCK or pom.xml file at this level because each driver
+should be completely independent of each other. i.e. The will be
+treated as individual applications. The 'microsemi' folder is only
+a grouping mechanism at the directory level.
\ No newline at end of file
diff --git a/drivers/microsemi/ea1000/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java b/drivers/microsemi/ea1000/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java
index 785ba8d..09b1621 100644
--- a/drivers/microsemi/ea1000/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java
+++ b/drivers/microsemi/ea1000/src/test/java/org/onosproject/yang/MockMicrosemiRegistrator.java
@@ -46,7 +46,7 @@
private static final String SER_FILE_PATH = "yang" + FS + "resources" +
FS + "YangMetaData.ser";
private static final String META_PATH =
- PATH.replace("drivers/microsemi", "")
+ PATH.replace("drivers/microsemi/ea1000", "")
+ SER_FILE_PATH;
@Override
diff --git a/drivers/microsemi/pom.xml b/drivers/microsemi/pom.xml
deleted file mode 100644
index 7745be2..0000000
--- a/drivers/microsemi/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright 2018-present Open Networking Foundation
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>onos-drivers-general</artifactId>
- <groupId>org.onosproject</groupId>
- <version>1.13.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>onos-drivers-microsemi</artifactId>
- <packaging>bundle</packaging>
- <description>This is just a dummy placeholder while the code is being moved</description>
- <url>http://onosproject.org</url>
-
- <dependencies>
- <dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-misc</artifactId>
- </dependency>
- </dependencies>
-</project>
-
diff --git a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/dummy/TestClass1.java b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/dummy/TestClass1.java
deleted file mode 100644
index 7a2e22b..0000000
--- a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/dummy/TestClass1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.drivers.microsemi.dummy;
-
-/**
- * This is a dummy class, only while the code is being moved.
- */
-public class TestClass1 {
- private String testString;
-}
diff --git a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/dummy/package-info.java b/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/dummy/package-info.java
deleted file mode 100644
index 9615b8b..0000000
--- a/drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/dummy/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This is a dummy package while the code is being moved.
- */
-package org.onosproject.drivers.microsemi.dummy;
\ No newline at end of file
diff --git a/drivers/pom.xml b/drivers/pom.xml
index d208fb6..cfc590d 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -51,7 +51,7 @@
<module>oplink</module>
<!-- <module>bmv2</module> -->
<module>hp</module>
- <module>microsemi</module>
+ <module>microsemi/ea1000</module>
</modules>
<!--<properties>
diff --git a/modules.defs b/modules.defs
index de29dc8..e1b6fdb 100644
--- a/modules.defs
+++ b/modules.defs
@@ -103,7 +103,7 @@
'//drivers/lisp:onos-drivers-lisp-oar',
'//drivers/flowspec:onos-drivers-flowspec-oar',
'//drivers/huawei:onos-drivers-huawei-oar',
- '//drivers/microsemi:onos-drivers-microsemi-oar',
+ '//drivers/microsemi/ea1000:onos-drivers-microsemi-ea1000-oar',
'//drivers/oplink:onos-drivers-oplink-oar',
'//drivers/bmv2:onos-drivers-bmv2-oar',
'//drivers/barefoot:onos-drivers-barefoot-oar',