[CORD-3091] Pulling NNI and PON ports

Change-Id: I001782ffd8a092371f4939869c9c6dda2360bf98
diff --git a/samples/olt_device.yaml b/samples/olt_device.yaml
index c83b65c..8277a9b 100644
--- a/samples/olt_device.yaml
+++ b/samples/olt_device.yaml
@@ -44,25 +44,3 @@
         - volt_service:
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
-
-    pon_port:
-      type: tosca.nodes.PONPort
-      properties:
-        name: test_olt_port_1
-        port_id: ff00ff
-        s_tag: 111
-      requirements:
-        - olt_device:
-            node: device#olt
-            relationship: tosca.relationships.BelongsToOne
-
-    onu:
-      type: tosca.nodes.ONUDevice
-      properties:
-        serial_number: BRCM1234
-        vendor: Broadcom
-        device_type: broadcom_onu
-      requirements:
-        - pon_port:
-            node: pon_port
-            relationship: tosca.relationships.BelongsToOne
diff --git a/samples/pon_port.yaml b/samples/pon_port.yaml
new file mode 100644
index 0000000..d35d0b8
--- /dev/null
+++ b/samples/pon_port.yaml
@@ -0,0 +1,44 @@
+# Copyright 2017-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.
+
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @pon_port.yaml http://192.168.99.100:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/oltdevice.yaml
+  - custom_types/onudevice.yaml
+  - custom_types/ponport.yaml
+  - custom_types/voltservice.yaml
+description: Create a simulated OLT Device in VOLTHA
+topology_template:
+  node_templates:
+
+    device#olt:
+      type: tosca.nodes.OLTDevice
+      properties:
+        device_type: simulated_olt
+        host: 172.17.0.1
+        port: 50060
+        must-exist: true
+
+    pon_port:
+      type: tosca.nodes.PONPort
+      properties:
+        name: test_olt_port_1
+        port_no: 2
+        s_tag: 222
+      requirements:
+        - olt_device:
+            node: device#olt
+            relationship: tosca.relationships.BelongsToOne