Waveserver Ai Driver support
Change-Id: I1d65e30b4b46dbad8802fd2edd9dec74b5d2ec18
revert readme
Change-Id: I32f7a9ec21f743d98cdece2ceb097fc65b784589
diff --git a/drivers/ciena/waveserver/BUCK b/drivers/ciena/waveserver/BUCK
index 0f3e825..095ec04 100644
--- a/drivers/ciena/waveserver/BUCK
+++ b/drivers/ciena/waveserver/BUCK
@@ -9,10 +9,10 @@
'//apps/optical-model:onos-apps-optical-model',
'//drivers/optical:onos-drivers-optical',
]
-
TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//core/api:onos-api-tests',
+ '//utils/osgi:onlab-osgi-tests',
]
BUNDLES = [
@@ -34,7 +34,7 @@
)
onos_app (
- app_name = 'org.onosproject.drivers.ciena.waveserver.rest',
+ app_name = 'org.onosproject.drivers.ciena.waveserver',
title = 'Ciena Waveserver Drivers',
category = 'Drivers',
url = 'http://onosproject.org',
diff --git a/drivers/ciena/waveserver/README.md b/drivers/ciena/waveserver/README.md
index aef0dc9..96a12b1 100644
--- a/drivers/ciena/waveserver/README.md
+++ b/drivers/ciena/waveserver/README.md
@@ -13,7 +13,7 @@
All that is required to activate the driver is to run the following at the ONOS CLI
```bash
-app activate org.onosproject.drivers.ciena.waveserver.rest
+app activate org.onosproject.drivers.ciena.waveserver
```
## Usage
@@ -49,8 +49,6 @@
}'
```
-
-
#### Verify Connected Device
When the Waveserver is configured and connected is should be visible in ONOS through the `devices` command.
diff --git a/drivers/ciena/waveserver/features.xml b/drivers/ciena/waveserver/features.xml
index 0611588..6893131 100644
--- a/drivers/ciena/waveserver/features.xml
+++ b/drivers/ciena/waveserver/features.xml
@@ -24,4 +24,4 @@
<bundle>mvn:${project.groupId}/onos-drivers-utilities/${project.version}</bundle>
</feature>
-</features>
+</features>
\ No newline at end of file
diff --git a/drivers/ciena/waveserver/pom.xml b/drivers/ciena/waveserver/pom.xml
index 88536bc..a508e72 100644
--- a/drivers/ciena/waveserver/pom.xml
+++ b/drivers/ciena/waveserver/pom.xml
@@ -26,15 +26,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>onos-drivers-ciena-waveserver-rest</artifactId>
+ <artifactId>onos-drivers-ciena-waveserver</artifactId>
<packaging>bundle</packaging>
- <description>Ciena Waveserver device drivers</description>
+ <description>Ciena device drivers</description>
<properties>
- <onos.app.name>org.onosproject.drivers.ciena.waveserver.rest</onos.app.name>
<onos.app.origin>ONOS Community</onos.app.origin>
- <onos.app.title>Ciena Waveserver Device Drivers</onos.app.title>
+ <onos.app.title>Ciena Device Drivers</onos.app.title>
<onos.app.category>Drivers</onos.app.category>
<onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.requires>
@@ -55,11 +54,13 @@
<artifactId>onos-drivers-utilities</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-restsb-api</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-drivers-optical</artifactId>
diff --git a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaDriversLoader.java b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/CienaDriversLoader.java
similarity index 95%
rename from drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaDriversLoader.java
rename to drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/CienaDriversLoader.java
index 11e3fc5..0752c4f 100644
--- a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/CienaDriversLoader.java
+++ b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/CienaDriversLoader.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onosproject.drivers.ciena.waveserver.rest;
+package org.onosproject.drivers.ciena.waveserver;
import org.apache.felix.scr.annotations.Component;
import org.onosproject.net.driver.AbstractDriverLoader;
diff --git a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/package-info.java b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/package-info.java
new file mode 100644
index 0000000..12532da
--- /dev/null
+++ b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016-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 for Ciena device drivers.
+ */
+package org.onosproject.drivers.ciena.waveserver;
\ No newline at end of file
diff --git a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/package-info.java b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/package-info.java
index 220063b..f58c992 100644
--- a/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/package-info.java
+++ b/drivers/ciena/waveserver/src/main/java/org/onosproject/drivers/ciena/waveserver/rest/package-info.java
@@ -17,4 +17,4 @@
/**
* Package for Ciena device drivers.
*/
-package org.onosproject.drivers.ciena.waveserver.rest;
\ No newline at end of file
+package org.onosproject.drivers.ciena.waveserver.rest;
diff --git a/drivers/ciena/waveserver/src/test/java/org/onosproject/drivers/ciena/waveserver/rest/CienaDriversLoaderTest.java b/drivers/ciena/waveserver/src/test/java/org/onosproject/drivers/ciena/waveserver/rest/CienaDriversLoaderTest.java
index 3a2786f..31a2aad 100644
--- a/drivers/ciena/waveserver/src/test/java/org/onosproject/drivers/ciena/waveserver/rest/CienaDriversLoaderTest.java
+++ b/drivers/ciena/waveserver/src/test/java/org/onosproject/drivers/ciena/waveserver/rest/CienaDriversLoaderTest.java
@@ -17,6 +17,7 @@
package org.onosproject.drivers.ciena.waveserver.rest;
import org.junit.Before;
+import org.onosproject.drivers.ciena.waveserver.CienaDriversLoader;
import org.onosproject.net.driver.AbstractDriverLoaderTest;
/**