Skip to content

Commit bd6d83c

Browse files
committed
Fixing bug in evc create command
Change-Id: Ib5440c07f9a3029e57e7842b3d76d4d550244258
1 parent 72d333b commit bd6d83c

File tree

6 files changed

+51
-7
lines changed

6 files changed

+51
-7
lines changed

carrierethernet/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
<parent>
2020
<groupId>org.onosproject</groupId>
2121
<artifactId>onos-dependencies</artifactId>
22-
<version>1.9.0</version>
22+
<version>1.10.1</version>
2323
<relativePath/><!-- parent is remote -->
2424
</parent>
2525

26-
<groupId>org.onosproject</groupId>
2726
<artifactId>onos-app-carrierethernet</artifactId>
2827
<version>04.2017</version>
2928
<packaging>bundle</packaging>
@@ -33,7 +32,7 @@
3332

3433
<properties>
3534
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<onos.version>1.9.0</onos.version>
35+
<onos.version>1.10.1</onos.version>
3736
<api.version>1.0.0</api.version>
3837
<onos.app.name>org.onosproject.ecord.carrierethernet</onos.app.name>
3938
<onos.app.origin>ON.Lab</onos.app.origin>
@@ -68,7 +67,7 @@
6867
<dependency>
6968
<groupId>org.onosproject</groupId>
7069
<artifactId>onos-apps-newoptical</artifactId>
71-
<version>1.10.0-SNAPSHOT</version>
70+
<version>${onos.version}</version>
7271
</dependency>
7372

7473
<dependency>

carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/app/CarrierEthernetEvcUtils.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* Copyright 2017 Open Networking Laboratory
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.onosproject.ecord.carrierethernet.app;
217

318
import org.onlab.packet.VlanId;

carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/cli/commands/CarrierEthernetCreateEvcCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class CarrierEthernetCreateEvcCommand extends AbstractShellCommand {
4141
"EVC type (defaults to POINT_TO_POINT or MULTIPOINT_TO_MULTIPOINT, depending on number of UNIs)",
4242
required = false, multiValued = false)
4343
String argEvcType = null;
44-
@Argument(index = 3, name = "argUniList",
44+
@Argument(index = 2, name = "argUniList",
4545
description = "List of UNIs (if point to multipoint, first is root, other are leaves)",
4646
required = true, multiValued = true)
4747
List<String> argUniList = Lists.newArrayList();

carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/CarrierEthernetWebResource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Response getEvcs() {
6565

6666
/**
6767
* Gets an EVC entry by deviceId.
68-
*
68+
* @param evcId The ID of an EVC
6969
* @return 200 OK with the requested Evc.
7070
*/
7171
@GET
@@ -79,6 +79,7 @@ public Response getEvc(@PathParam("evcId") String evcId) {
7979

8080
/**
8181
* Install an EVC with given parameters.
82+
* @param stream An input stream
8283
*
8384
* @return 200 OK if the EVC was installed
8485
*/

carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodec.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
package org.onosproject.ecord.carrierethernet.rest;
1+
/*
2+
* Copyright 2017-present Open Networking Laboratory
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/package org.onosproject.ecord.carrierethernet.rest;
216

317
import com.fasterxml.jackson.databind.node.ArrayNode;
418
import com.fasterxml.jackson.databind.node.ObjectNode;

carrierethernet/src/main/java/org/onosproject/ecord/carrierethernet/rest/EvcCodecRegistrator.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/*
2+
* Copyright 2017-present Open Networking Laboratory
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.onosproject.ecord.carrierethernet.rest;
217

318
import org.apache.felix.scr.annotations.Activate;

0 commit comments

Comments
 (0)