Bgp and Pcep maintaiability
Change-Id: I2c14cc29d4900ef2f0fbffd4761b0d78e282910f
diff --git a/providers/pcep/BUCK b/providers/pcep/BUCK
index c5b609d..ce77c96 100644
--- a/providers/pcep/BUCK
+++ b/providers/pcep/BUCK
@@ -1,6 +1,7 @@
BUNDLES = [
'//providers/pcep/topology:onos-providers-pcep-topology',
'//providers/pcep/tunnel:onos-providers-pcep-tunnel',
+ '//providers/pcep/cli:onos-providers-pcep-cli',
'//protocols/pcep/api:onos-protocols-pcep-api',
'//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
'//protocols/pcep/ctl:onos-protocols-pcep-ctl',
diff --git a/providers/pcep/app/app.xml b/providers/pcep/app/app.xml
index 1bdef05..1acc35d 100644
--- a/providers/pcep/app/app.xml
+++ b/providers/pcep/app/app.xml
@@ -25,4 +25,5 @@
<artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>
+ <artifact>mvn:${project.groupId}/onos-pcep-provider-cli/${project.version}</artifact>
</app>
diff --git a/providers/pcep/app/features.xml b/providers/pcep/app/features.xml
index 002f7f6..7f846be 100644
--- a/providers/pcep/app/features.xml
+++ b/providers/pcep/app/features.xml
@@ -24,5 +24,6 @@
<bundle>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</bundle>
<bundle>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</bundle>
+ <bundle>mvn:${project.groupId}/onos-pcep-provider-cli/${project.version}</bundle>
</feature>
</features>
diff --git a/providers/pcep/app/pom.xml b/providers/pcep/app/pom.xml
index f3b2d08..4d2439f 100644
--- a/providers/pcep/app/pom.xml
+++ b/providers/pcep/app/pom.xml
@@ -53,6 +53,11 @@
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
+ <artifactId>onos-pcep-provider-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-pcep-provider-tunnel</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/providers/pcep/cli/BUCK b/providers/pcep/cli/BUCK
new file mode 100644
index 0000000..93199e4
--- /dev/null
+++ b/providers/pcep/cli/BUCK
@@ -0,0 +1,12 @@
+COMPILE_DEPS = [
+ '//lib:CORE_DEPS',
+ '//incubator/api:onos-incubator-api',
+ '//protocols/pcep/ctl:onos-protocols-pcep-ctl',
+ '//protocols/pcep/api:onos-protocols-pcep-api',
+ '//lib:org.apache.karaf.shell.console',
+ '//cli:onos-cli',
+]
+
+osgi_jar_with_tests (
+ deps = COMPILE_DEPS,
+)
diff --git a/providers/pcep/cli/pom.xml b/providers/pcep/cli/pom.xml
new file mode 100644
index 0000000..b9b04bc
--- /dev/null
+++ b/providers/pcep/cli/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2016-present Open Networking Laboratory
+ ~
+ ~ 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-pcep-providers</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>onos-pcep-provider-cli</artifactId>
+ <packaging>bundle</packaging>
+
+ <description>PCEP cli implementation</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-pcep-controller-impl</artifactId>
+ <version>1.9.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/providers/pcep/cli/src/main/java/org/onosproject/pcep/cli/PcepSessionCommand.java b/providers/pcep/cli/src/main/java/org/onosproject/pcep/cli/PcepSessionCommand.java
new file mode 100644
index 0000000..420dd0c
--- /dev/null
+++ b/providers/pcep/cli/src/main/java/org/onosproject/pcep/cli/PcepSessionCommand.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * 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.pcep.cli;
+
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.pcep.controller.PcepClientController;
+import org.onosproject.pcep.controller.PcepErrorDetail;
+import org.onosproject.pcep.controller.PcepErrorType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Set;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.TreeMap;
+
+
+@Command(scope = "onos", name = "pcep", description = "Pcep Session Info")
+public class PcepSessionCommand extends AbstractShellCommand {
+ private static final Logger log = LoggerFactory.getLogger(PcepSessionCommand.class);
+ private static final String SESSION = "session";
+ private static final String EXCEPTION = "exception";
+ private static final String ERROR = "error";
+ private PcepClientController pcepClientController;
+ private byte sessionId;
+ private Set<String> pcepSessionKeySet;
+ private Set<String> pcepSessionIdKeySet;
+ private Integer sessionIdValue = 0;
+ private String sessionStatus;
+ private List pcepSessionExceptions = new ArrayList();
+ private Set<String> pcepSessionFailurekeySet;
+ private PcepErrorDetail pcepErrorDetail;
+ private PcepErrorType pcepErrorType;
+ private Map<Integer, String> sessionEstablishmentFailureMap = new TreeMap<>();
+ private Map<Integer, String> unknownObjectMap = new TreeMap<>();
+ private Map<Integer, String> notSupportedObjectMap = new TreeMap<>();
+ private Map<Integer, String> policyViolationMap = new TreeMap<>();
+ private Map<Integer, String> mandatoryObjectMissingMap = new TreeMap<>();
+ private Map<Integer, String> receptionOfInvalidObjectMap = new TreeMap<>();
+ private Map<Integer, String> invalidOperationMap = new TreeMap<>();
+ private Set<Integer> pcepErrorMsgKey;
+ private Integer pcepErrorValue = 0;
+
+ @Argument(index = 0, name = "name",
+ description = "session" + "\n" + "exception" + "\n" + "error",
+ required = true, multiValued = false)
+ String name = null;
+ @Argument(index = 1, name = "peer",
+ description = "peerIp",
+ required = false, multiValued = false)
+ String peer = null;
+
+ @Override
+ protected void execute() {
+ switch (name) {
+ case SESSION:
+ displayPcepSession();
+ break;
+ case EXCEPTION:
+ displayPcepSessionFailureReason();
+ break;
+ case ERROR:
+ displayPcepErrorMsgs();
+ break;
+ default:
+ System.out.print("Unknown Command");
+ break;
+ }
+ }
+
+ private void displayPcepSession() {
+ try {
+ this.pcepClientController = get(PcepClientController.class);
+ Map<String, String> pcepSessionMap = pcepClientController.getPcepSessionMap();
+ Map<String, Byte> pcepSessionIdMap = pcepClientController.getPcepSessionIdMap();
+ pcepSessionKeySet = pcepSessionMap.keySet();
+ pcepSessionIdKeySet = pcepSessionIdMap.keySet();
+ if (peer != null) {
+ if (pcepSessionKeySet.size() > 0) {
+ if (pcepSessionKeySet.contains(peer)) {
+ for (String pcepSessionPeer : pcepSessionKeySet) {
+ if (pcepSessionPeer.equals(peer)) {
+ for (String pcepSessionId : pcepSessionIdKeySet) {
+ if (pcepSessionId.equals(peer)) {
+ sessionId = pcepSessionIdMap.get(pcepSessionId);
+ sessionStatus = pcepSessionMap.get(pcepSessionPeer);
+ if (sessionId < 0) {
+ sessionIdValue = sessionId + 256;
+ } else {
+ sessionIdValue = (int) sessionId;
+ }
+ }
+ }
+ print("SessionIp = %s, Status = %s, sessionId = %s", pcepSessionPeer, sessionStatus, sessionIdValue);
+ }
+ }
+ } else {
+ System.out.print("Wrong Peer IP");
+ }
+ }
+ } else {
+ if (pcepSessionKeySet.size() > 0) {
+ for (String pcepSessionPeer : pcepSessionKeySet) {
+ for (String pcepSessionId : pcepSessionIdKeySet) {
+ if (pcepSessionId.equals(pcepSessionPeer)) {
+ sessionId = pcepSessionIdMap.get(pcepSessionId);
+ sessionStatus = pcepSessionMap.get(pcepSessionPeer);
+ if (sessionId < 0) {
+ sessionIdValue = sessionId + 256;
+ } else {
+ sessionIdValue = (int) sessionId;
+ }
+ }
+ }
+ print("SessionIp = %s, Status = %s, sessionId = %s", pcepSessionPeer, sessionStatus, sessionIdValue);
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.debug("Error occurred while displaying PCEP session information: {}", e.getMessage());
+ }
+ }
+
+ private void displayPcepSessionFailureReason() {
+ try {
+ this.pcepClientController = get(PcepClientController.class);
+ Map<String, List<String>> pcepSessionFailureReasonMap = pcepClientController.getPcepExceptions();
+ pcepSessionFailurekeySet = pcepSessionFailureReasonMap.keySet();
+ if (pcepSessionFailurekeySet.size() > 0) {
+ if (peer != null) {
+ if (pcepSessionFailurekeySet.contains(peer)) {
+ for (String pcepSessionPeerId : pcepSessionFailurekeySet) {
+ if (pcepSessionPeerId.equals(peer)) {
+ pcepSessionExceptions = pcepSessionFailureReasonMap.get(pcepSessionPeerId);
+ print("PeerId = %s, FailureReason = %s", pcepSessionPeerId, pcepSessionExceptions);
+ }
+ }
+ } else {
+ System.out.print("Wrong Peer IP");
+ }
+
+ } else {
+ pcepSessionFailurekeySet = pcepSessionFailureReasonMap.keySet();
+ if (pcepSessionFailurekeySet.size() > 0) {
+ for (String pcepSessionPeerId : pcepSessionFailurekeySet) {
+ pcepSessionExceptions = pcepSessionFailureReasonMap.get(pcepSessionPeerId);
+ print("PeerId = %s, FailureReason = %s", pcepSessionPeerId, pcepSessionExceptions);
+ }
+ }
+ }
+
+ }
+
+
+ } catch (Exception e) {
+ log.debug("Error occurred while displaying PCEP session failure reasons: {}", e.getMessage());
+ }
+
+ }
+
+
+ private void displayPcepErrorMsgs() {
+ try {
+ this.pcepClientController = get(PcepClientController.class);
+ Map<Integer, Integer> pcepErrorMsgMap = pcepClientController.getPcepErrorMsg();
+ pcepErrorMsgKey = pcepErrorMsgMap.keySet();
+ if (pcepErrorMsgKey.size() > 0) {
+ for (Integer errorType : pcepErrorMsgKey) {
+ pcepErrorValue = pcepErrorMsgMap.get(errorType);
+ pcepErrorType = PcepErrorType.values()[errorType];
+ switch (pcepErrorType) {
+ case SESSIONESTABLISHMENTFAILURE:
+ sessionEstablishmentFailureMap = pcepErrorDetail.sessionEstablishmentFailure();
+ Set<Integer> sessionFailureKeySet = sessionEstablishmentFailureMap.keySet();
+ for (Integer sessionFailureKey : sessionFailureKeySet) {
+ if (sessionFailureKey == pcepErrorValue) {
+ System.out.print(sessionEstablishmentFailureMap.get(sessionFailureKey));
+ }
+ }
+ case CAPABALITYNOTSUPPORTED:
+ System.out.print("Capability not supported");
+ case UNKNOWNOBJECT:
+ unknownObjectMap = pcepErrorDetail.unknownObject();
+ Set<Integer> unknownObjectKeySet = unknownObjectMap.keySet();
+ for (Integer unknownObjectKey : unknownObjectKeySet) {
+ if (unknownObjectKey == pcepErrorValue) {
+ System.out.print(unknownObjectMap.get(unknownObjectKey));
+ }
+ }
+ case NOTSUPPORTEDOBJECT:
+ notSupportedObjectMap = pcepErrorDetail.notSupportedObject();
+ Set<Integer> notSupportedObjectKeySet = notSupportedObjectMap.keySet();
+ for (Integer notSupportedObjectKey : notSupportedObjectKeySet) {
+ if (notSupportedObjectKey == pcepErrorValue) {
+ System.out.print(notSupportedObjectMap.get(notSupportedObjectKey));
+ }
+ }
+ case POLICYVIOLATION:
+ policyViolationMap = pcepErrorDetail.policyViolation();
+ Set<Integer> policyViolationKeySet = policyViolationMap.keySet();
+ for (Integer policyViolationKey : policyViolationKeySet) {
+ if (policyViolationKey == pcepErrorValue) {
+ System.out.print(policyViolationMap.get(policyViolationKey));
+ }
+ }
+ case MANDATORYOBJECTMISSING:
+ mandatoryObjectMissingMap = pcepErrorDetail.mandatoryObjectMissing();
+ Set<Integer> mandatoryObjectMissingKeySet = mandatoryObjectMissingMap.keySet();
+ for (Integer mandatoryObjectMissingKey : mandatoryObjectMissingKeySet) {
+ if (mandatoryObjectMissingKey == pcepErrorValue) {
+ System.out.print(mandatoryObjectMissingMap.get(mandatoryObjectMissingKey));
+ }
+ }
+ case SYNCHRONIZEDPATHCOMPUTATIONREQUESTMISSING:
+ System.out.print("Synchronized path computation request missing");
+ case UNKNOWNREQUESTREFERENCE:
+ System.out.print("Unknown request reference");
+ case ESTABLISHINGSECONDPCEPSESSION:
+ System.out.print("Attempt to establish a second PCEP session");
+ case RECEPTIONOFINVALIDOBJECT:
+ receptionOfInvalidObjectMap = pcepErrorDetail.receptionOfInvalidObject();
+ Set<Integer> receptionOfInvalidObjectKeySet = receptionOfInvalidObjectMap.keySet();
+ for (Integer receptionOfInvalidObjectKey : receptionOfInvalidObjectKeySet) {
+ if (receptionOfInvalidObjectKey == pcepErrorValue) {
+ System.out.print(receptionOfInvalidObjectMap.get(receptionOfInvalidObjectKey));
+ }
+ }
+ case INVALIDOPERATION:
+ invalidOperationMap = pcepErrorDetail.invalidOperation();
+ Set<Integer> invalidOperationKeySet = invalidOperationMap.keySet();
+ for (Integer invalidOperationKey : invalidOperationKeySet) {
+ if (invalidOperationKey == pcepErrorValue) {
+ System.out.print(invalidOperationMap.get(invalidOperationKey));
+ }
+ }
+ case VIRTUALNETWORKTLVMISSING:
+ System.out.print("VIRTUAL-NETWORK TLV missing");
+ default:
+ System.out.print("Unknown error message");
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.debug("Error occurred while displaying PCEP error messages received: {}", e.getMessage());
+ }
+ }
+}
diff --git a/providers/pcep/cli/src/main/java/org/onosproject/pcep/cli/package-info.java b/providers/pcep/cli/src/main/java/org/onosproject/pcep/cli/package-info.java
new file mode 100644
index 0000000..2dd3a6d
--- /dev/null
+++ b/providers/pcep/cli/src/main/java/org/onosproject/pcep/cli/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Created by root1 on 23/8/16.
+ */
+package org.onosproject.pcep.cli;
\ No newline at end of file
diff --git a/providers/pcep/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/providers/pcep/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
new file mode 100644
index 0000000..aef97fd
--- /dev/null
+++ b/providers/pcep/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -0,0 +1,10 @@
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
+
+ <command>
+ <action class="org.onosproject.pcep.cli.PcepSessionCommand"/>
+ </command>
+ </command-bundle>
+
+</blueprint>
diff --git a/providers/pcep/pom.xml b/providers/pcep/pom.xml
index a48bce5..491d5bb 100644
--- a/providers/pcep/pom.xml
+++ b/providers/pcep/pom.xml
@@ -27,5 +27,6 @@
<module>topology</module>
<module>tunnel</module>
<module>app</module>
+ <module>cli</module>
</modules>
</project>
\ No newline at end of file
diff --git a/providers/pcep/topology/src/test/java/org/onosproject/provider/pcep/topology/impl/PcepClientControllerAdapter.java b/providers/pcep/topology/src/test/java/org/onosproject/provider/pcep/topology/impl/PcepClientControllerAdapter.java
index 459ebc9..86487d9 100644
--- a/providers/pcep/topology/src/test/java/org/onosproject/provider/pcep/topology/impl/PcepClientControllerAdapter.java
+++ b/providers/pcep/topology/src/test/java/org/onosproject/provider/pcep/topology/impl/PcepClientControllerAdapter.java
@@ -15,12 +15,7 @@
*/
package org.onosproject.provider.pcep.topology.impl;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
+
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Deactivate;
@@ -48,6 +43,15 @@
import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.List;
+import java.util.Map;
+
import static org.onosproject.pcepio.types.PcepErrorDetailInfo.ERROR_TYPE_19;
import static org.onosproject.pcepio.types.PcepErrorDetailInfo.ERROR_VALUE_5;
@@ -306,6 +310,32 @@
}
@Override
+ public Map<String, List<String>> getPcepExceptions() {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, Integer> getPcepErrorMsg() {
+ return null;
+ }
+
+ @Override
+ public Map<String, String> getPcepSessionMap() {
+ return null;
+ }
+
+ @Override
+ public Map<String, Byte> getPcepSessionIdMap() {
+ return null;
+ }
+
+ @Override
+ public void peerErrorMsg(String peerId, Integer errorType, Integer errValue) {
+ return;
+ }
+
+
+ @Override
public boolean allocateLocalLabel(Tunnel tunnel) {
// TODO Auto-generated method stub
return false;
diff --git a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepClientControllerAdapter.java b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepClientControllerAdapter.java
index a541734..4bcba82 100644
--- a/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepClientControllerAdapter.java
+++ b/providers/pcep/tunnel/src/test/java/org/onosproject/provider/pcep/tunnel/impl/PcepClientControllerAdapter.java
@@ -21,6 +21,8 @@
import java.util.LinkedList;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.List;
+import java.util.Map;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Deactivate;
@@ -299,6 +301,31 @@
}
@Override
+ public Map<String, List<String>> getPcepExceptions() {
+ return null;
+ }
+
+ @Override
+ public Map<Integer, Integer> getPcepErrorMsg() {
+ return null;
+ }
+
+ @Override
+ public Map<String, String> getPcepSessionMap() {
+ return null;
+ }
+
+ @Override
+ public Map<String, Byte> getPcepSessionIdMap() {
+ return null;
+ }
+
+ @Override
+ public void peerErrorMsg(String peerId, Integer errorType, Integer errValue) {
+ return;
+ }
+
+ @Override
public boolean allocateLocalLabel(Tunnel tunnel) {
// TODO Auto-generated method stub
return false;