Change equipmentMapping input for connector

README.md

@@ -12,9 +12,9 @@ In principle, the NetExplorerProxy is a passthrough of data from the MWDI (Micro
 #### v1.2.2
 
 This release udpates the input source for /v1/provide-ltp-equipment-mappings data.
-This service was added in 1.2.0_spec with ltpAugment::equipment being the input source for related equipment uuids.
-This attribute has been marked as deprecated and therefore should no longer be used.
-This release instead uses ltpAugment::equipmentIdentifier information (equipment uuids have to be extracted).
+This service was added in 1.2.0_spec with ltpAugment::equipment and ltpAugment::connector being the input source for related equipment uuids and connector localIds.
+These attributes have been marked as deprecated and therefore should no longer be used.
+This release instead uses ltpAugment::equipmentIdentifier and ltpAugment::connectorIdentifier information (IDs have to be extracted).
 
 See related issue collection [NEP v1.2.2_spec](https://github.com/openBackhaul/NetExplorerProxy/milestone/13).  
 

spec/NetExplorerProxy+config.json

@@ -460,7 +460,7 @@
               "string-name": "EmbeddingCausesRequestForDeviceDataFromMwdi"
             },
             "string-profile-configuration": {
-              "string-value": "equipment-augment-1-0:control-construct-pac(device-model-name;external-label);equipment-augment-1-0:protocol-collection(protocol(lldp-1-0:lldp-pac(local-system-data(system-name))));logical-termination-point(uuid;operational-state;ltp-augment-1-0:ltp-augment-pac(original-ltp-name;external-label;connector;equipment-identifier);layer-protocol(local-id;administrative-state;wire-interface-2-0:wire-interface-pac(wire-interface-configuration(interface-name;fixed-pmd-kind);wire-interface-capability(supported-pmd-kind-list);wire-interface-status(interface-status;pmd-kind-cur));ethernet-container-2-0:ethernet-container-pac(ethernet-container-configuration(interface-name;bundling-is-on);ethernet-container-status(interface-status));air-interface-2-0:air-interface-pac(air-interface-configuration(transmission-mode-min;transmission-mode-max;power-is-on;transmitter-is-on;xpic-is-on);air-interface-status(interface-status);air-interface-capability(transmission-mode-list(transmission-mode-name;modulation-scheme-name-at-lct;modulation-scheme;channel-bandwidth;symbol-rate-reduction-factor;code-rate;xpic-is-avail);type-of-equipment))));equipment(uuid;local-id;actual-equipment(manufactured-thing(equipment-type(version;description;model-identifier;part-type-identifier;type-name);manufacturer-properties(manufacturer-name;manufacturer-identifier))))"
+              "string-value": "equipment-augment-1-0:control-construct-pac(device-model-name;external-label);equipment-augment-1-0:protocol-collection(protocol(lldp-1-0:lldp-pac(local-system-data(system-name))));logical-termination-point(uuid;operational-state;ltp-augment-1-0:ltp-augment-pac(original-ltp-name;external-label;connector-identifier;equipment-identifier);layer-protocol(local-id;administrative-state;wire-interface-2-0:wire-interface-pac(wire-interface-configuration(interface-name;fixed-pmd-kind);wire-interface-capability(supported-pmd-kind-list);wire-interface-status(interface-status;pmd-kind-cur));ethernet-container-2-0:ethernet-container-pac(ethernet-container-configuration(interface-name;bundling-is-on);ethernet-container-status(interface-status));air-interface-2-0:air-interface-pac(air-interface-configuration(transmission-mode-min;transmission-mode-max;power-is-on;transmitter-is-on;xpic-is-on);air-interface-status(interface-status);air-interface-capability(transmission-mode-list(transmission-mode-name;modulation-scheme-name-at-lct;modulation-scheme;channel-bandwidth;symbol-rate-reduction-factor;code-rate;xpic-is-avail);type-of-equipment))));equipment(uuid;local-id;actual-equipment(manufactured-thing(equipment-type(version;description;model-identifier;part-type-identifier;type-name);manufacturer-properties(manufacturer-name;manufacturer-identifier))))"
             }
           }
         }

spec/NetExplorerProxy+profileInstances.yaml

@@ -271,5 +271,5 @@ profile-instances:
     capability:
       string-name: 'EmbeddingCausesRequestForDeviceDataFromMwdi'
     configuration:
-      string-value: 'equipment-augment-1-0:control-construct-pac(device-model-name;external-label);equipment-augment-1-0:protocol-collection(protocol(lldp-1-0:lldp-pac(local-system-data(system-name))));logical-termination-point(uuid;operational-state;ltp-augment-1-0:ltp-augment-pac(original-ltp-name;external-label;connector;equipment-indentifier);layer-protocol(local-id;administrative-state;wire-interface-2-0:wire-interface-pac(wire-interface-configuration(interface-name;fixed-pmd-kind);wire-interface-capability(supported-pmd-kind-list);wire-interface-status(interface-status;pmd-kind-cur));ethernet-container-2-0:ethernet-container-pac(ethernet-container-configuration(interface-name;bundling-is-on);ethernet-container-status(interface-status));air-interface-2-0:air-interface-pac(air-interface-configuration(transmission-mode-min;transmission-mode-max;power-is-on;transmitter-is-on;xpic-is-on);air-interface-status(interface-status);air-interface-capability(transmission-mode-list(transmission-mode-name;modulation-scheme-name-at-lct;modulation-scheme;channel-bandwidth;symbol-rate-reduction-factor;code-rate;xpic-is-avail);type-of-equipment))));equipment(uuid;local-id;actual-equipment(manufactured-thing(equipment-type(version;description;model-identifier;part-type-identifier;type-name);manufacturer-properties(manufacturer-name;manufacturer-identifier))))'
+      string-value: 'equipment-augment-1-0:control-construct-pac(device-model-name;external-label);equipment-augment-1-0:protocol-collection(protocol(lldp-1-0:lldp-pac(local-system-data(system-name))));logical-termination-point(uuid;operational-state;ltp-augment-1-0:ltp-augment-pac(original-ltp-name;external-label;connector-identifier;equipment-indentifier);layer-protocol(local-id;administrative-state;wire-interface-2-0:wire-interface-pac(wire-interface-configuration(interface-name;fixed-pmd-kind);wire-interface-capability(supported-pmd-kind-list);wire-interface-status(interface-status;pmd-kind-cur));ethernet-container-2-0:ethernet-container-pac(ethernet-container-configuration(interface-name;bundling-is-on);ethernet-container-status(interface-status));air-interface-2-0:air-interface-pac(air-interface-configuration(transmission-mode-min;transmission-mode-max;power-is-on;transmitter-is-on;xpic-is-on);air-interface-status(interface-status);air-interface-capability(transmission-mode-list(transmission-mode-name;modulation-scheme-name-at-lct;modulation-scheme;channel-bandwidth;symbol-rate-reduction-factor;code-rate;xpic-is-avail);type-of-equipment))));equipment(uuid;local-id;actual-equipment(manufactured-thing(equipment-type(version;description;model-identifier;part-type-identifier;type-name);manufacturer-properties(manufacturer-name;manufacturer-identifier))))'
 

spec/additionalDescription/_LtpEquipmentMappings.md

@@ -23,22 +23,28 @@ The following data for all devices should be gathered into the following columns
   - `timestamp`: the timestamp from when the data was gathered by the cyclic process and written to NEP cache.
 - from *ltpAugment* (2):
   - `uuid`: this is the *logical-termination-point/uuid*
-  - `connector`: this is the value from *ltp-augment-1-0:ltp-augment-pac/connector*
-    - not every ltp-augment contains this attribute; in such cases leave the output field empty
+  - `connector`: this is the value from *ltp-augment-1-0:ltp-augment-pac/connector-identifier*
+    - not every ltpAugment contains this attribute; in such cases leave the output field empty
+    - connectorIdentifier contains the localId as a substing inside a path, the localId must be extracted from that path
   - `equipment`: this is the value is to be extracted from *ltp-augment-1-0:ltp-augment-pac/equipment-identifier*
     - equipmentIdentifier is an array, if the attribute contains multiple array items, the values shall be delimited by "|"
     - equipmentIdentifier contains the uuid as a substring inside a path, the uuid must be extracted from that path
 
-**EquipmentIdentifier uuid extraction**  
+**LtpAugment connector and equipment ID extraction**  
 The equipmentIdentifier contains the equipment uuids in a path format, the uuid must be extracted from it.
+The connectorIdentifier contains the connector localId in a path format, the local-id must be extracted from it.
+
 E.g. from
 ```
+  (1)
   "equipment-identifier": [
-    "/core-model-1-4:control-construct/equipment[uuid='1921261567']"
-  ]
+      "/core-model-1-4:control-construct/equipment[uuid='CTRL IduBoard Xpic 32E1']"
+  ],
+  (2)
+  "connector-identifier": "/core-model-1-4:control-construct/equipment[uuid='CTRL IduBoard Xpic 32E1']/connector[local-id='LAN-2-RJ45-Connector']"
 ```
-uuid `1921261567` must be extracted.
-
+The equipment uuid must be extracted from (1) as "CTRL IduBoard Xpic 32E1".
+The connector localId must be extracted from (2) as "LAN-2-RJ45-Connector"
 
 Note:  
 - for (1) see description of service [*/v1/provide-general-information-of-devices*](./_GeneralDeviceInfoMappings.md)