commit 1f1fef77bebc9151f15f6d2930a469317542877e
author kavitha Alagesan <kalagesa@partner.ciena.com> Thu Dec 08 17:07:12 2016 +0530
committer Jonathan Hart <jono@onlab.us> Wed Jan 11 17:51:34 2017 +0000
tree 24e80a3a14ee3036274b0b35aee60e24c6cd2462
parent 69524397a611d57df3736f3338379f2855869e7f

ONOS-5728

Change-Id: If6da56301f669011a40290a280defeadd4f4dd78
(cherry picked from commit c3a904f9fcc54849a450756a8d30475deed4c9bf)

cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
index e3ae4d8..52b8050 100644
--- a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
@@ -27,6 +27,7 @@
 import org.onosproject.net.config.SubjectFactory;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.onlab.util.Tools.nullIsIllegal;
 
 /**
  * Manages network configuration.
@@ -35,6 +36,8 @@
         description = "Manages network configuration")
 public class NetworkConfigCommand extends AbstractShellCommand {
 
+    private static final String E_CLASSKEY_NOT_REGISTERED = " is not a registered SubjectClassKey";
+
     @Argument(index = 0, name = "subjectClassKey", description = "Subject class key",
             required = false, multiValued = false)
     String subjectClassKey = null;
@@ -57,7 +60,8 @@
         if (isNullOrEmpty(subjectClassKey)) {
             addAll((ObjectNode) root);
         } else {
-            SubjectFactory subjectFactory = service.getSubjectFactory(subjectClassKey);
+            SubjectFactory subjectFactory = nullIsIllegal(service.getSubjectFactory(subjectClassKey),
+                                subjectClassKey + E_CLASSKEY_NOT_REGISTERED);
             if (isNullOrEmpty(subjectKey)) {
                 addSubjectClass((ObjectNode) root, subjectFactory);
             } else {