diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
index 2776a19..0abbcee 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/OpticalPathProvisioner.java
@@ -26,6 +26,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onlab.util.Bandwidth;
+import org.onlab.util.GuavaCollectors;
 import org.onlab.util.KryoNamespace;
 import org.onosproject.cluster.ClusterService;
 import org.onosproject.core.ApplicationId;
@@ -80,6 +81,7 @@
 
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -233,6 +235,12 @@
         log.info("Stopped");
     }
 
+    @Override
+    public Collection<OpticalConnectivity> listConnectivity() {
+        return connectivityMap.values().stream()
+            .map(Versioned::value)
+            .collect(GuavaCollectors.toImmutableList());
+    }
     /*
      * Request packet-layer connectivity between specified ports,
      * over packet-optical multi-layer infrastructure.
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalPathService.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalPathService.java
index 8da5d54..4e95224 100644
--- a/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalPathService.java
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/api/OpticalPathService.java
@@ -21,8 +21,10 @@
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Link;
 import org.onosproject.net.Path;
+import org.onosproject.newoptical.OpticalConnectivity;
 
 import java.time.Duration;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
@@ -68,4 +70,11 @@
      * @return list of link that compose a path. empty if ID is invalid.
      */
     Optional<List<Link>> getPath(OpticalConnectivityId id);
+
+    /**
+     * Lists collection of known OpticalConnectivity.
+     *
+     * @return collection of OpticalConnectivity
+     */
+    Collection<OpticalConnectivity> listConnectivity();
 }
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/ListOpticalConnectivityCommand.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/ListOpticalConnectivityCommand.java
new file mode 100644
index 0000000..fa8bf0a
--- /dev/null
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/ListOpticalConnectivityCommand.java
@@ -0,0 +1,48 @@
+/*
+ * 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.newoptical.cli;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.LinkKey;
+import org.onosproject.newoptical.OpticalConnectivity;
+import org.onosproject.newoptical.api.OpticalPathService;
+
+@Command(scope = "onos", name = "list-optical-connectivity",
+        description = "List optical domain connectivity")
+public class ListOpticalConnectivityCommand extends AbstractShellCommand {
+
+    @Override
+    protected void execute() {
+        OpticalPathService opticalPathService = get(OpticalPathService.class);
+
+        Collection<OpticalConnectivity> connectivities = opticalPathService.listConnectivity();
+
+        for (OpticalConnectivity connectivity : connectivities) {
+            print("Optical connectivity ID: %s", connectivity.id().id());
+            print(" links: %s",
+                                connectivity.links().stream()
+                                    .map(LinkKey::linkKey)
+                                    .map(lk -> lk.src() + "-" + lk.dst())
+                                    .collect(Collectors.joining(", ")));
+            print(" Bandwidth: %s, Latency: %s", connectivity.bandwidth(), connectivity.latency());
+
+        }
+    }
+}
diff --git a/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java
new file mode 100644
index 0000000..a062985
--- /dev/null
+++ b/apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2017-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.newoptical.cli;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.onlab.util.Identifier;
+import org.onosproject.cli.AbstractChoicesCompleter;
+import org.onosproject.newoptical.OpticalConnectivity;
+import org.onosproject.newoptical.api.OpticalPathService;
+
+import static org.onosproject.cli.AbstractShellCommand.get;
+
+/**
+ * Completer for OpticalConnectivityId.
+ */
+public class OpticalConnectivityIdCompleter extends AbstractChoicesCompleter {
+
+    @Override
+    protected List<String> choices() {
+        OpticalPathService opticalPathService = get(OpticalPathService.class);
+
+        return opticalPathService.listConnectivity().stream()
+                .map(OpticalConnectivity::id)
+                .map(Identifier::id)
+                .map(String::valueOf)
+                .collect(Collectors.toList());
+    }
+
+}
diff --git a/apps/newoptical/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/newoptical/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 72bdcaa..95c2465 100644
--- a/apps/newoptical/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/apps/newoptical/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -24,12 +24,24 @@
                 <null/>
             </completers>
         </command>
+
         <command>
             <action class="org.onosproject.newoptical.cli.RemoveOpticalConnectivityCommand"/>
+            <completers>
+                <ref component-id="opticalConnectivityIdCompleter"/>
+                <null/>
+            </completers>
         </command>
+
+        <command>
+            <action class="org.onosproject.newoptical.cli.ListOpticalConnectivityCommand"/>
+        </command>
+
     </command-bundle>
 
     <!-- TODO complete only applicable ports -->
     <bean id="connectPointCompleter" class="org.onosproject.cli.net.ConnectPointCompleter"/>
 
+    <bean id="opticalConnectivityIdCompleter" class="org.onosproject.newoptical.cli.OpticalConnectivityIdCompleter"/>
+
 </blueprint>
