- For intermediate rates we need to differentiate
OTSI group interface name to extract rate.
- Change "OTSI-GROUP" to "OTSIGROUP"
- Appending "-x00G" to the OTSi-Group interface
name, where x = 2, 3, or 4.
- OTUCn (ODUCn), where n = 2, 3, or 4
JIRA: TRNSPRTPCE-585
Signed-off-by: Balagangadhar Bathula <bb4341@att.com>
Change-Id: I84540954d357b68c9255af34b1bfc1ea13035752
// Create generic interface
InterfaceBuilder otsiGroupInterfaceBldr = createGenericInterfaceBuilder(portMap, OtsiGroup.class,
// Create generic interface
InterfaceBuilder otsiGroupInterfaceBldr = createGenericInterfaceBuilder(portMap, OtsiGroup.class,
- logicalConnPoint + "-OTSI-GROUP");
+ logicalConnPoint + String.join("-","", "OTSIGROUP", "400G"));
// Create a list
List<String> listSupportingOtsiInterface = new ArrayList<>();
// Create a list
List<String> listSupportingOtsiInterface = new ArrayList<>();
.setSpeed(Uint32.valueOf(100000));
InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(
portMap, EthernetCsmacd.class,
.setSpeed(Uint32.valueOf(100000));
InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(
portMap, EthernetCsmacd.class,
- logicalConnPoint + "-ETHERNET100G");
+ logicalConnPoint + "-ETHERNET-100G");
// Create Interface1 type object required for adding as augmentation
Interface1Builder ethIf1Builder = new Interface1Builder();
ethInterfaceBldr.addAugmentation(ethIf1Builder.setEthernet(ethIfBuilder.build()).build());
// Create Interface1 type object required for adding as augmentation
Interface1Builder ethIf1Builder = new Interface1Builder();
ethInterfaceBldr.addAugmentation(ethIf1Builder.setEthernet(ethIfBuilder.build()).build());
if (isNetworkPort) {
supportingInterface = portMap.getSupportingOducn();
} else {
if (isNetworkPort) {
supportingInterface = portMap.getSupportingOducn();
} else {
- supportingInterface = logicalConnPoint + "-ETHERNET100G";
+ supportingInterface = logicalConnPoint + "-ETHERNET-100G";
}
if (supportingInterface == null) {
}
if (supportingInterface == null) {
String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
String.valueOf(lowerSpectralSlotNumber),
String.valueOf(higherSpectralSlotNumber));
String spectralSlotName = String.join(GridConstant.SPECTRAL_SLOT_SEPARATOR,
String.valueOf(lowerSpectralSlotNumber),
String.valueOf(higherSpectralSlotNumber));
if (destTp.contains(StringConstants.NETWORK_TOKEN)
|| srcTp.contains(StringConstants.CLIENT_TOKEN)
|| srcTp.contains(StringConstants.NETWORK_TOKEN)
if (destTp.contains(StringConstants.NETWORK_TOKEN)
|| srcTp.contains(StringConstants.CLIENT_TOKEN)
|| srcTp.contains(StringConstants.NETWORK_TOKEN)
nodeOpenRoadmVersion.equals(OpenroadmNodeVersion._71)
? Map.of(
"ODU", List.of("ODUC4","ODUFLEX"),
nodeOpenRoadmVersion.equals(OpenroadmNodeVersion._71)
? Map.of(
"ODU", List.of("ODUC4","ODUFLEX"),
- "other", List.of("OTUC4", "OTSI-GROUP", spectralSlotName))
+ // -400G added due to the change in naming convention
+ "other", List.of("OTUC4", "OTSIGROUP-400G", spectralSlotName))
: Map.of(
"ODU", List.of("ODU", "ODU4"),
"other", List.of("OTU", spectralSlotName));
: Map.of(
"ODU", List.of("ODU", "ODU4"),
"other", List.of("OTU", spectralSlotName));
interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, srcTp, suffix));
}
}
interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, srcTp, suffix));
}
}
if (srcTp.contains(StringConstants.CLIENT_TOKEN)) {
interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, srcTp, "ETHERNET"));
}
if (destTp.contains(StringConstants.CLIENT_TOKEN)) {
if (srcTp.contains(StringConstants.CLIENT_TOKEN)) {
interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, srcTp, "ETHERNET"));
}
if (destTp.contains(StringConstants.CLIENT_TOKEN)) {
interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, destTp, "ETHERNET"));
}
return interfacesToDelete;
interfacesToDelete.add(String.join(GridConstant.NAME_PARAMETERS_SEPARATOR, destTp, "ETHERNET"));
}
return interfacesToDelete;
time.sleep(2)
# Check correct configuration of devices
time.sleep(2)
# Check correct configuration of devices
- def test_14_check_interface_och_xpdra2(self):
+ def test_14_check_interface_otsi_xpdra2(self):
response = test_utils.check_netconf_node_request(
"XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
self.assertEqual(response.status_code, requests.codes.ok)
response = test_utils.check_netconf_node_request(
"XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
self.assertEqual(response.status_code, requests.codes.ok)
def test_15_check_interface_OTSI_GROUP_xpdra2(self):
response = test_utils.check_netconf_node_request(
def test_15_check_interface_OTSI_GROUP_xpdra2(self):
response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-OTSI-GROUP")
+ "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC4',
+ input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'supporting-interface-list': 'XPDR2-NETWORK1-755:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'supporting-interface-list': 'XPDR2-NETWORK1-755:768',
"XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
"XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSI-GROUP',
+ input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
- 'supporting-interface-list': 'XPDR2-NETWORK1-OTSI-GROUP',
+ 'supporting-interface-list': 'XPDR2-NETWORK1-OTSIGROUP-400G',
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
res['interface'][0]
['org-openroadm-otn-otu-interfaces:otu'])
res['interface'][0]
['org-openroadm-otn-otu-interfaces:otu'])
- def test_17_check_interface_och_xpdrc2(self):
+ def test_17_check_interface_otsi_xpdrc2(self):
response = test_utils.check_netconf_node_request(
"XPDR-C2", "interface/XPDR2-NETWORK1-755:768")
self.assertEqual(response.status_code, requests.codes.ok)
response = test_utils.check_netconf_node_request(
"XPDR-C2", "interface/XPDR2-NETWORK1-755:768")
self.assertEqual(response.status_code, requests.codes.ok)
def test_18_check_interface_OTSI_GROUP_xpdrc2(self):
response = test_utils.check_netconf_node_request(
def test_18_check_interface_OTSI_GROUP_xpdrc2(self):
response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-NETWORK1-OTSI-GROUP")
+ "XPDR-C2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSI-GROUP',
+ input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'supporting-interface-list': 'XPDR2-NETWORK1-755:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
'supporting-interface-list': 'XPDR2-NETWORK1-755:768',
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
- 'supporting-interface-list': 'XPDR2-NETWORK1-OTSI-GROUP',
+ 'supporting-interface-list': 'XPDR2-NETWORK1-OTSIGROUP-400G',
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'
}
def test_31_check_interface_100GE_CLIENT_xpdra2(self):
response = test_utils.check_netconf_node_request(
def test_31_check_interface_100GE_CLIENT_xpdra2(self):
response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET100G")
+ "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET100G',
+ input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'type': 'org-openroadm-interfaces:ethernetCsmacd',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'type': 'org-openroadm-interfaces:ethernetCsmacd',
input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
- 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET100G',
+ 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G',
'type': 'org-openroadm-interfaces:otnOdu',
'supporting-port': 'C1'}
input_dict_2 = {
'type': 'org-openroadm-interfaces:otnOdu',
'supporting-port': 'C1'}
input_dict_2 = {
def test_35_check_interface_100GE_CLIENT_xpdrc2(self):
response = test_utils.check_netconf_node_request(
def test_35_check_interface_100GE_CLIENT_xpdrc2(self):
response = test_utils.check_netconf_node_request(
- "XPDR-C2", "interface/XPDR2-CLIENT1-ETHERNET100G")
+ "XPDR-C2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET100G',
+ input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'type': 'org-openroadm-interfaces:ethernetCsmacd',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
'type': 'org-openroadm-interfaces:ethernetCsmacd',
input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4-service-100GE',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
- 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET100G',
+ 'supporting-interface-list': 'XPDR2-CLIENT1-ETHERNET-100G',
'type': 'org-openroadm-interfaces:otnOdu',
'supporting-port': 'C1'}
input_dict_2 = {
'type': 'org-openroadm-interfaces:otnOdu',
'supporting-port': 'C1'}
input_dict_2 = {
def test_52_check_no_interface_100GE_CLIENT_xpdra2(self):
response = test_utils.check_netconf_node_request(
def test_52_check_no_interface_100GE_CLIENT_xpdra2(self):
response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET100G")
+ "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
self.assertEqual(response.status_code, requests.codes.conflict)
def test_53_check_otn_topo_links(self):
self.assertEqual(response.status_code, requests.codes.conflict)
def test_53_check_otn_topo_links(self):
"XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
self.assertEqual(response.status_code, requests.codes.conflict)
"XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
self.assertEqual(response.status_code, requests.codes.conflict)
- def test_63_check_no_interface_OCH_xpdra2(self):
+ def test_63_check_no_interface_OTSI_xpdra2(self):
response = test_utils.check_netconf_node_request(
"XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
self.assertEqual(response.status_code, requests.codes.conflict)
response = test_utils.check_netconf_node_request(
"XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
self.assertEqual(response.status_code, requests.codes.conflict)
- def test_64_check_no_interface_OTSI_xpdra2(self):
+ def test_64_check_no_interface_OTSIG_xpdra2(self):
response = test_utils.check_netconf_node_request(
response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR2-NETWORK1-OTSI-GROUP")
+ "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
self.assertEqual(response.status_code, requests.codes.conflict)
def test_65_getLinks_OtnTopology(self):
self.assertEqual(response.status_code, requests.codes.conflict)
def test_65_getLinks_OtnTopology(self):
def test_80_check_interface_OTSI_GROUP_xpdra2(self):
response = test_utils.check_netconf_node_request(
def test_80_check_interface_OTSI_GROUP_xpdra2(self):
response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-OTSI-GROUP")
+ "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE',
+ input_dict_1 = {'name': 'XPDR1-NETWORK1-OTSIGROUP-400G',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
['supporting-interface-list'][0]: 'XPDR1-NETWORK1-755:768',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
['supporting-interface-list'][0]: 'XPDR1-NETWORK1-755:768',
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
'administrative-state': 'inService',
'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
- ['supporting-interface-list'][0]: 'XPDR1-NETWORK1-OTSI-GROUP',
+ ['supporting-interface-list'][0]: 'XPDR1-NETWORK1-OTSIGROUP-400G',
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'}
input_dict_2 = {"tx-sapi": "ANeUjNzWtDLV",
'type': 'org-openroadm-interfaces:otnOtu',
'supporting-port': 'L1'}
input_dict_2 = {"tx-sapi": "ANeUjNzWtDLV",
def test_87_check_no_interface_OTSI_GROUP_xpdra2(self):
response = test_utils.check_netconf_node_request(
def test_87_check_no_interface_OTSI_GROUP_xpdra2(self):
response = test_utils.check_netconf_node_request(
- "XPDR-A2", "interface/XPDR1-NETWORK1-OTSI-GROUP")
+ "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G")
self.assertEqual(response.status_code, requests.codes.conflict)
def test_88_check_no_interface_OTSI_xpdra2(self):
self.assertEqual(response.status_code, requests.codes.conflict)
def test_88_check_no_interface_OTSI_xpdra2(self):