"org-openroadm-network:model":"2"
},
{
- "node-id":"ROADMC",
+ "node-id":"ROADMC01",
"supporting-node":[
{
"network-ref":"clli-network",
"org-openroadm-network:model":"1"
},
{
- "node-id":"ROADMA",
+ "node-id":"ROADMA01",
"supporting-node":[
{
"network-ref":"clli-network",
"org-openroadm-network:model":"2"
},
{
- "node-id":"XPDRA",
+ "node-id":"XPDRA01",
"supporting-node":[
{
"network-ref":"clli-network",
"network-id":"openroadm-topology",
"node":[
{
- "node-id":"XPDRA-XPDR1",
+ "node-id":"XPDRA01-XPDR1",
"org-openroadm-network-topology:node-type":"XPONDER",
"ietf-network-topology:termination-point":[
{
"supporting-node":[
{
"network-ref":"openroadm-network",
- "node-ref":"XPDRA"
+ "node-ref":"XPDRA01"
}
]
},
{
- "node-id":"ROADMC-DEG2",
+ "node-id":"ROADMC01-DEG2",
"org-openroadm-network-topology:degree-attributes":{
"degree-number":2,
"available-wavelengths":[
]
},
{
- "node-id":"ROADMC-SRG1",
+ "node-id":"ROADMC01-SRG1",
"org-openroadm-network-topology:srg-attributes":{
"available-wavelengths":[
{
]
},
{
- "node-id":"ROADMA-DEG1",
+ "node-id":"ROADMA01-DEG1",
"org-openroadm-network-topology:degree-attributes":{
"degree-number":1,
"available-wavelengths":[
"supporting-node":[
{
"network-ref":"openroadm-network",
- "node-ref":"ROADMA"
+ "node-ref":"ROADMA01"
}
]
},
{
- "node-id":"ROADMA-DEG2",
+ "node-id":"ROADMA01-DEG2",
"org-openroadm-network-topology:degree-attributes":{
"degree-number":2,
"available-wavelengths":[
"supporting-node":[
{
"network-ref":"openroadm-network",
- "node-ref":"ROADMA"
+ "node-ref":"ROADMA01"
}
]
},
]
},
{
- "node-id":"ROADMC-DEG1",
+ "node-id":"ROADMC01-DEG1",
"org-openroadm-network-topology:degree-attributes":{
"degree-number":1,
"available-wavelengths":[
"supporting-node":[
{
"network-ref":"openroadm-network",
- "node-ref":"ROADMC"
+ "node-ref":"ROADMC01"
}
]
},
]
},
{
- "node-id":"ROADMA-SRG1",
+ "node-id":"ROADMA01-SRG1",
"org-openroadm-network-topology:srg-attributes":{
"available-wavelengths":[
{
"supporting-node":[
{
"network-ref":"openroadm-network",
- "node-ref":"ROADMA"
+ "node-ref":"ROADMA01"
}
]
},
},
"ietf-network-topology:link":[
{
- "link-id":"ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX",
+ "link-id":"ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX",
"source":{
- "source-node":"ROADMA-DEG1",
+ "source-node":"ROADMA01-DEG1",
"source-tp":"DEG1-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"DROP-LINK",
"destination":{
- "dest-node":"ROADMA-SRG1",
+ "dest-node":"ROADMA01-SRG1",
"dest-tp":"SRG1-CP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX"
},
{
- "link-id":"ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX",
+ "link-id":"ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX",
"source":{
- "source-node":"ROADMA-DEG2",
+ "source-node":"ROADMA01-DEG2",
"source-tp":"DEG2-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"DROP-LINK",
"destination":{
- "dest-node":"ROADMA-SRG1",
+ "dest-node":"ROADMA01-SRG1",
"dest-tp":"SRG1-CP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX"
},
{
- "link-id":"ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX",
+ "link-id":"ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX",
"source":{
- "source-node":"ROADMA-DEG1",
+ "source-node":"ROADMA01-DEG1",
"source-tp":"DEG1-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"EXPRESS-LINK",
"destination":{
- "dest-node":"ROADMA-DEG2",
+ "dest-node":"ROADMA01-DEG2",
"dest-tp":"DEG2-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX"
},
{
- "link-id":"ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX",
+ "link-id":"ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX",
"source":{
- "source-node":"ROADMC-DEG1",
+ "source-node":"ROADMC01-DEG1",
"source-tp":"DEG1-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"DROP-LINK",
"destination":{
- "dest-node":"ROADMC-SRG1",
+ "dest-node":"ROADMC01-SRG1",
"dest-tp":"SRG1-CP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX"
},
{
"link-id":"ROADMB-DEG1-DEG1-CTP-TXRXtoROADMB-SRG1-SRG1-CP-TXRX",
"org-openroadm-common-network:opposite-link":"ROADMB-SRG1-SRG1-CP-TXRXtoROADMB-DEG2-DEG2-CTP-TXRX"
},
{
- "link-id":"ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX",
+ "link-id":"ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX",
"source":{
- "source-node":"ROADMC-DEG2",
+ "source-node":"ROADMC01-DEG2",
"source-tp":"DEG2-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"DROP-LINK",
"destination":{
- "dest-node":"ROADMC-SRG1",
+ "dest-node":"ROADMC01-SRG1",
"dest-tp":"SRG1-CP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX"
},
{
- "link-id":"ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX",
+ "link-id":"ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX",
"source":{
- "source-node":"ROADMC-DEG1",
+ "source-node":"ROADMC01-DEG1",
"source-tp":"DEG1-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"EXPRESS-LINK",
"destination":{
- "dest-node":"ROADMC-DEG2",
+ "dest-node":"ROADMC01-DEG2",
"dest-tp":"DEG2-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX"
},
{
"link-id":"ROADMB-DEG1-DEG1-CTP-TXRXtoROADMB-DEG2-DEG2-CTP-TXRX",
"org-openroadm-common-network:opposite-link":"ROADMB-DEG2-DEG2-CTP-TXRXtoROADMB-DEG1-DEG1-CTP-TXRX"
},
{
- "link-id":"ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX",
+ "link-id":"ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX",
"source":{
- "source-node":"ROADMA-DEG1",
+ "source-node":"ROADMA01-DEG1",
"source-tp":"DEG1-TTP-TXRX"
},
"org-openroadm-network-topology:OMS-attributes":{
- "opposite-link":"ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX",
+ "opposite-link":"ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX",
"span":{
"spanloss-base":11.4,
"link-concatenation":[
},
"org-openroadm-network-topology:link-type":"ROADM-TO-ROADM",
"destination":{
- "dest-node":"ROADMC-DEG2",
+ "dest-node":"ROADMC01-DEG2",
"dest-tp":"DEG2-TTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX"
},
{
- "link-id":"XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX",
+ "link-id":"XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX",
"source":{
- "source-node":"XPDRA-XPDR1",
+ "source-node":"XPDRA01-XPDR1",
"source-tp":"XPDR1-NETWORK1"
},
- "org-openroadm-network-topology:opposite-link":"ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1",
+ "org-openroadm-network-topology:opposite-link":"ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1",
"org-openroadm-network-topology:link-type":"XPONDER-OUTPUT",
"destination":{
- "dest-node":"ROADMA-SRG1",
+ "dest-node":"ROADMA01-SRG1",
"dest-tp":"SRG1-PP1-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1"
},
{
- "link-id":"ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX",
+ "link-id":"ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX",
"source":{
- "source-node":"ROADMC-DEG1",
+ "source-node":"ROADMC01-DEG1",
"source-tp":"DEG1-TTP-TXRX"
},
"org-openroadm-network-topology:OMS-attributes":{
- "opposite-link":"ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX",
+ "opposite-link":"ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX",
"span":{
"spanloss-base":11.4,
"link-concatenation":[
"dest-node":"ROADMB-DEG2",
"dest-tp":"DEG2-TTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX"
},
{
- "link-id":"ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX",
+ "link-id":"ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX",
"source":{
"source-node":"ROADMB-DEG1",
"source-tp":"DEG1-TTP-TXRX"
},
"org-openroadm-network-topology:OMS-attributes":{
- "opposite-link":"ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX",
+ "opposite-link":"ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX",
"span":{
"spanloss-base":11.4,
"link-concatenation":[
},
"org-openroadm-network-topology:link-type":"ROADM-TO-ROADM",
"destination":{
- "dest-node":"ROADMA-DEG2",
+ "dest-node":"ROADMA01-DEG2",
"dest-tp":"DEG2-TTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX"
},
{
- "link-id":"ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX",
+ "link-id":"ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX",
"source":{
- "source-node":"ROADMA-SRG1",
+ "source-node":"ROADMA01-SRG1",
"source-tp":"SRG1-CP-TXRX"
},
"org-openroadm-network-topology:link-type":"ADD-LINK",
"destination":{
- "dest-node":"ROADMA-DEG2",
+ "dest-node":"ROADMA01-DEG2",
"dest-tp":"DEG2-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX"
},
{
- "link-id":"ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX",
+ "link-id":"ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX",
"source":{
- "source-node":"ROADMA-DEG2",
+ "source-node":"ROADMA01-DEG2",
"source-tp":"DEG2-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"EXPRESS-LINK",
"destination":{
- "dest-node":"ROADMA-DEG1",
+ "dest-node":"ROADMA01-DEG1",
"dest-tp":"DEG1-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX"
},
{
"link-id":"XPDRB-XPDR1-XPDR1-NETWORK1toROADMB-SRG1-SRG1-PP1-TXRX",
"org-openroadm-common-network:opposite-link":"ROADMB-SRG1-SRG1-PP1-TXRXtoXPDRB-XPDR1-XPDR1-NETWORK1"
},
{
- "link-id":"ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX",
+ "link-id":"ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX",
"source":{
- "source-node":"ROADMA-SRG1",
+ "source-node":"ROADMA01-SRG1",
"source-tp":"SRG1-CP-TXRX"
},
"org-openroadm-network-topology:link-type":"ADD-LINK",
"destination":{
- "dest-node":"ROADMA-DEG1",
+ "dest-node":"ROADMA01-DEG1",
"dest-tp":"DEG1-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX"
},
{
- "link-id":"ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1",
+ "link-id":"ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1",
"source":{
- "source-node":"ROADMA-SRG1",
+ "source-node":"ROADMA01-SRG1",
"source-tp":"SRG1-PP1-TXRX"
},
- "org-openroadm-network-topology:opposite-link":"XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX",
+ "org-openroadm-network-topology:opposite-link":"XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX",
"org-openroadm-network-topology:link-type":"XPONDER-INPUT",
"destination":{
- "dest-node":"XPDRA-XPDR1",
+ "dest-node":"XPDRA01-XPDR1",
"dest-tp":"XPDR1-NETWORK1"
},
- "org-openroadm-common-network:opposite-link":"XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX"
+ "org-openroadm-common-network:opposite-link":"XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX"
},
{
- "link-id":"ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX",
+ "link-id":"ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX",
"source":{
- "source-node":"ROADMC-DEG2",
+ "source-node":"ROADMC01-DEG2",
"source-tp":"DEG2-CTP-TXRX"
},
"org-openroadm-network-topology:link-type":"EXPRESS-LINK",
"destination":{
- "dest-node":"ROADMC-DEG1",
+ "dest-node":"ROADMC01-DEG1",
"dest-tp":"DEG1-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX"
},
{
- "link-id":"ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX",
+ "link-id":"ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX",
"source":{
"source-node":"ROADMB-DEG2",
"source-tp":"DEG2-TTP-TXRX"
},
"org-openroadm-network-topology:OMS-attributes":{
- "opposite-link":"ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX",
+ "opposite-link":"ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX",
"span":{
"spanloss-base":11.4,
"link-concatenation":[
},
"org-openroadm-network-topology:link-type":"ROADM-TO-ROADM",
"destination":{
- "dest-node":"ROADMC-DEG1",
+ "dest-node":"ROADMC01-DEG1",
"dest-tp":"DEG1-TTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX"
},
{
"link-id":"ROADMB-DEG2-DEG2-CTP-TXRXtoROADMB-DEG1-DEG1-CTP-TXRX",
"org-openroadm-common-network:opposite-link":"ROADMB-DEG1-DEG1-CTP-TXRXtoROADMB-DEG2-DEG2-CTP-TXRX"
},
{
- "link-id":"ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX",
+ "link-id":"ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX",
"source":{
- "source-node":"ROADMA-DEG2",
+ "source-node":"ROADMA01-DEG2",
"source-tp":"DEG2-TTP-TXRX"
},
"org-openroadm-network-topology:OMS-attributes":{
- "opposite-link":"ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX",
+ "opposite-link":"ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX",
"span":{
"spanloss-base":11.4,
"link-concatenation":[
"dest-node":"ROADMB-DEG1",
"dest-tp":"DEG1-TTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX"
},
{
- "link-id":"ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX",
+ "link-id":"ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX",
"source":{
- "source-node":"ROADMC-SRG1",
+ "source-node":"ROADMC01-SRG1",
"source-tp":"SRG1-CP-TXRX"
},
"org-openroadm-network-topology:link-type":"ADD-LINK",
"destination":{
- "dest-node":"ROADMC-DEG2",
+ "dest-node":"ROADMC01-DEG2",
"dest-tp":"DEG2-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX"
},
{
- "link-id":"ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX",
+ "link-id":"ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX",
"source":{
- "source-node":"ROADMC-DEG2",
+ "source-node":"ROADMC01-DEG2",
"source-tp":"DEG2-TTP-TXRX"
},
"org-openroadm-network-topology:OMS-attributes":{
- "opposite-link":"ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX",
+ "opposite-link":"ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX",
"span":{
"spanloss-base":11.4,
"link-concatenation":[
},
"org-openroadm-network-topology:link-type":"ROADM-TO-ROADM",
"destination":{
- "dest-node":"ROADMA-DEG1",
+ "dest-node":"ROADMA01-DEG1",
"dest-tp":"DEG1-TTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX"
},
{
- "link-id":"ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX",
+ "link-id":"ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX",
"source":{
- "source-node":"ROADMC-SRG1",
+ "source-node":"ROADMC01-SRG1",
"source-tp":"SRG1-CP-TXRX"
},
"org-openroadm-network-topology:link-type":"ADD-LINK",
"destination":{
- "dest-node":"ROADMC-DEG1",
+ "dest-node":"ROADMC01-DEG1",
"dest-tp":"DEG1-CTP-TXRX"
},
- "org-openroadm-common-network:opposite-link":"ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX"
+ "org-openroadm-common-network:opposite-link":"ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX"
},
{
"link-id":"ROADMB-SRG1-SRG1-CP-TXRXtoROADMB-DEG1-DEG1-CTP-TXRX",
<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
<network-id>openroadm-topology</network-id>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</opposite-link>
+ <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
<destination>
<dest-tp>DEG1-CTP-TXRX</dest-tp>
- <dest-node>ROADMA-DEG1</dest-node>
+ <dest-node>ROADMA01-DEG1</dest-node>
</destination>
<source>
- <source-node>ROADMA-DEG2</source-node>
+ <source-node>ROADMA01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</opposite-link>
+ <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
<destination>
<dest-tp>DEG2-CTP-TXRX</dest-tp>
- <dest-node>ROADMC-DEG2</dest-node>
+ <dest-node>ROADMC01-DEG2</dest-node>
</destination>
<source>
- <source-node>ROADMC-SRG1</source-node>
+ <source-node>ROADMC01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</opposite-link>
+ <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
<destination>
<dest-tp>DEG1-CTP-TXRX</dest-tp>
- <dest-node>ROADMA-DEG1</dest-node>
+ <dest-node>ROADMA01-DEG1</dest-node>
</destination>
<source>
- <source-node>ROADMA-SRG1</source-node>
+ <source-node>ROADMA01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1</opposite-link>
+ <link-id>XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</opposite-link>
<destination>
<dest-tp>SRG1-PP1-TXRX</dest-tp>
- <dest-node>ROADMA-SRG1</dest-node>
+ <dest-node>ROADMA01-SRG1</dest-node>
</destination>
<source>
- <source-node>XPDRA-XPDR1</source-node>
+ <source-node>XPDRA01-XPDR1</source-node>
<source-tp>XPDR1-NETWORK1</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</opposite-link>
+ <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
<destination>
<dest-tp>DEG2-CTP-TXRX</dest-tp>
- <dest-node>ROADMA-DEG2</dest-node>
+ <dest-node>ROADMA01-DEG2</dest-node>
</destination>
<source>
- <source-node>ROADMA-DEG1</source-node>
+ <source-node>ROADMA01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</opposite-link>
+ <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
<destination>
<dest-tp>DEG1-CTP-TXRX</dest-tp>
- <dest-node>ROADMC-DEG1</dest-node>
+ <dest-node>ROADMC01-DEG1</dest-node>
</destination>
<source>
- <source-node>ROADMC-DEG2</source-node>
+ <source-node>ROADMC01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</opposite-link>
+ <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
<destination>
<dest-tp>DEG2-CTP-TXRX</dest-tp>
- <dest-node>ROADMC-DEG2</dest-node>
+ <dest-node>ROADMC01-DEG2</dest-node>
</destination>
<source>
- <source-node>ROADMC-DEG1</source-node>
+ <source-node>ROADMC01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">EXPRESS-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX</opposite-link>
+ <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
<destination>
<dest-tp>SRG1-CP-TXRX</dest-tp>
- <dest-node>ROADMA-SRG1</dest-node>
+ <dest-node>ROADMA01-SRG1</dest-node>
</destination>
<source>
- <source-node>ROADMA-DEG1</source-node>
+ <source-node>ROADMA01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</opposite-link>
+ <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
<destination>
<dest-tp>SRG1-CP-TXRX</dest-tp>
- <dest-node>ROADMA-SRG1</dest-node>
+ <dest-node>ROADMA01-SRG1</dest-node>
</destination>
<source>
- <source-node>ROADMA-DEG2</source-node>
+ <source-node>ROADMA01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX</opposite-link>
+ <link-id>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
<destination>
<dest-tp>DEG2-TTP-TXRX</dest-tp>
- <dest-node>ROADMC-DEG2</dest-node>
+ <dest-node>ROADMC01-DEG2</dest-node>
</destination>
<source>
- <source-node>ROADMA-DEG1</source-node>
+ <source-node>ROADMA01-DEG1</source-node>
<source-tp>DEG1-TTP-TXRX</source-tp>
</source>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
- <opposite-link>ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX</opposite-link>
+ <opposite-link>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
<TE-metric>10</TE-metric>
<span>
<clfi>fiber1</clfi>
<link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX</opposite-link>
+ <link-id>ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</opposite-link>
<destination>
<dest-tp>XPDR1-NETWORK1</dest-tp>
- <dest-node>XPDRA-XPDR1</dest-node>
+ <dest-node>XPDRA01-XPDR1</dest-node>
</destination>
<source>
- <source-node>ROADMA-SRG1</source-node>
+ <source-node>ROADMA01-SRG1</source-node>
<source-tp>SRG1-PP1-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX</opposite-link>
+ <link-id>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
<destination>
<dest-tp>DEG1-TTP-TXRX</dest-tp>
- <dest-node>ROADMA-DEG1</dest-node>
+ <dest-node>ROADMA01-DEG1</dest-node>
</destination>
<source>
- <source-node>ROADMC-DEG2</source-node>
+ <source-node>ROADMC01-DEG2</source-node>
<source-tp>DEG2-TTP-TXRX</source-tp>
</source>
<OMS-attributes xmlns="http://org/openroadm/network/topology">
- <opposite-link>ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX</opposite-link>
+ <opposite-link>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
<TE-metric>10</TE-metric>
<span>
<clfi>fiber2</clfi>
<link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</opposite-link>
+ <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
<destination>
<dest-tp>SRG1-CP-TXRX</dest-tp>
- <dest-node>ROADMC-SRG1</dest-node>
+ <dest-node>ROADMC01-SRG1</dest-node>
</destination>
<source>
- <source-node>ROADMC-DEG1</source-node>
+ <source-node>ROADMC01-DEG1</source-node>
<source-tp>DEG1-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</opposite-link>
+ <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
<destination>
<dest-tp>DEG1-CTP-TXRX</dest-tp>
- <dest-node>ROADMC-DEG1</dest-node>
+ <dest-node>ROADMC01-DEG1</dest-node>
</destination>
<source>
- <source-node>ROADMC-SRG1</source-node>
+ <source-node>ROADMC01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX</opposite-link>
+ <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
<destination>
<dest-tp>SRG1-CP-TXRX</dest-tp>
- <dest-node>ROADMC-SRG1</dest-node>
+ <dest-node>ROADMC01-SRG1</dest-node>
</destination>
<source>
- <source-node>ROADMC-DEG2</source-node>
+ <source-node>ROADMC01-DEG2</source-node>
<source-tp>DEG2-CTP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">DROP-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMC-SRG1-SRG1-PP1-TXRXtoXPDRC-XPDR1-XPDR1-NETWORK1</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">XPDRC-XPDR1-XPDR1-NETWORK1toROADMC-SRG1-SRG1-PP1-TXRX</opposite-link>
+ <link-id>ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</opposite-link>
<destination>
<dest-tp>XPDR1-NETWORK1</dest-tp>
- <dest-node>XPDRC-XPDR1</dest-node>
+ <dest-node>XPDRC01-XPDR1</dest-node>
</destination>
<source>
- <source-node>ROADMC-SRG1</source-node>
+ <source-node>ROADMC01-SRG1</source-node>
<source-tp>SRG1-PP1-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">XPONDER-INPUT</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX</opposite-link>
+ <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
<destination>
<dest-tp>DEG2-CTP-TXRX</dest-tp>
- <dest-node>ROADMA-DEG2</dest-node>
+ <dest-node>ROADMA01-DEG2</dest-node>
</destination>
<source>
- <source-node>ROADMA-SRG1</source-node>
+ <source-node>ROADMA01-SRG1</source-node>
<source-tp>SRG1-CP-TXRX</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">ADD-LINK</link-type>
</link>
<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
- <link-id>XPDRC-XPDR1-XPDR1-NETWORK1toROADMC-SRG1-SRG1-PP1-TXRX</link-id>
- <opposite-link xmlns="http://org/openroadm/common/network">ROADMC-SRG1-SRG1-PP1-TXRXtoXPDRC-XPDR1-XPDR1-NETWORK1</opposite-link>
+ <link-id>XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</link-id>
+ <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</opposite-link>
<destination>
<dest-tp>SRG1-PP1-TXRX</dest-tp>
- <dest-node>ROADMC-SRG1</dest-node>
+ <dest-node>ROADMC01-SRG1</dest-node>
</destination>
<source>
- <source-node>XPDRC-XPDR1</source-node>
+ <source-node>XPDRC01-XPDR1</source-node>
<source-tp>XPDR1-NETWORK1</source-tp>
</source>
<link-type xmlns="http://org/openroadm/network/topology">XPONDER-OUTPUT</link-type>
<openroadm-common-network xmlns="http://org/openroadm/common/network"></openroadm-common-network>
</network-types>
<node>
- <node-id>ROADMC-SRG1</node-id>
+ <node-id>ROADMC01-SRG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP12-TXRX</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>ROADMC</node-ref>
+ <node-ref>ROADMC01</node-ref>
</supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths>
<node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
</node>
<node>
- <node-id>ROADMC-DEG1</node-id>
+ <node-id>ROADMC01-DEG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG1-CTP-TXRX</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>ROADMC</node-ref>
+ <node-ref>ROADMC01</node-ref>
</supporting-node>
<node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
</degree-attributes>
</node>
<node>
- <node-id>ROADMC-DEG2</node-id>
+ <node-id>ROADMC01-DEG2</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG2-TTP-TXRX</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>ROADMC</node-ref>
+ <node-ref>ROADMC01</node-ref>
</supporting-node>
<node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
</degree-attributes>
</node>
<node>
- <node-id>ROADMA-SRG1</node-id>
+ <node-id>ROADMA01-SRG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>SRG1-PP12-TXRX</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">SRG-TXRX-PP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>ROADMA</node-ref>
+ <node-ref>ROADMA01</node-ref>
</supporting-node>
<srg-attributes xmlns="http://org/openroadm/network/topology">
<available-wavelengths>
<node-type xmlns="http://org/openroadm/network/topology">SRG</node-type>
</node>
<node>
- <node-id>XPDRA-XPDR1</node-id>
+ <node-id>XPDRA01-XPDR1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-NETWORK2</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>XPDRA</node-ref>
+ <node-ref>XPDRA01</node-ref>
</supporting-node>
<node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
</node>
<node>
- <node-id>ROADMA-DEG2</node-id>
+ <node-id>ROADMA01-DEG2</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG2-TTP-TXRX</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-TTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>ROADMA</node-ref>
+ <node-ref>ROADMA01</node-ref>
</supporting-node>
<node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
</degree-attributes>
</node>
<node>
- <node-id>XPDRC-XPDR1</node-id>
+ <node-id>XPDRC01-XPDR1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>XPDR1-NETWORK2</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">XPONDER-NETWORK</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>XPDRC</node-ref>
+ <node-ref>XPDRC01</node-ref>
</supporting-node>
<node-type xmlns="http://org/openroadm/network/topology">XPONDER</node-type>
</node>
<node>
- <node-id>ROADMA-DEG1</node-id>
+ <node-id>ROADMA01-DEG1</node-id>
<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
<tp-id>DEG1-CTP-TXRX</tp-id>
<tp-type xmlns="http://org/openroadm/network/topology">DEGREE-TXRX-CTP</tp-type>
</termination-point>
<supporting-node>
<network-ref>openroadm-network</network-ref>
- <node-ref>ROADMA</node-ref>
+ <node-ref>ROADMA01</node-ref>
</supporting-node>
<node-type xmlns="http://org/openroadm/network/topology">DEGREE</node-type>
<degree-attributes xmlns="http://org/openroadm/network/topology">
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>ROADMA</node-id>
+ <node-id>ROADMA01</node-id>
<node-number>2</node-number>
<node-type>rdm</node-type>
<clli>NodeA</clli>
<nbr-list>
<if-name>
<ifName>eth-2/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMC</remoteSysName>
+ <remoteSysName>ROADMC01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
<nbr-list>
<if-name>
<ifName>eth-2/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMA</remoteSysName>
+ <remoteSysName>ROADMA01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
</if-name>
<if-name>
<ifName>eth-3/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMC</remoteSysName>
+ <remoteSysName>ROADMC01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>ROADMC</node-id>
+ <node-id>ROADMC01</node-id>
<node-number>2</node-number>
<node-type>rdm</node-type>
<clli>NodeC</clli>
</if-name>
<if-name>
<ifName>eth-3/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMA</remoteSysName>
+ <remoteSysName>ROADMA01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>XPDRA</node-id>
+ <node-id>XPDRA01</node-id>
<node-number>1</node-number>
<node-type>xpdr</node-type>
<clli>NodeA</clli>
</netconf>
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>ROADMA</node-id>
+ <node-id>ROADMA01</node-id>
<node-number>2</node-number>
<node-type>rdm</node-type>
<clli>NodeA</clli>
<nbr-list>
<if-name>
<ifName>eth-2/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMC</remoteSysName>
+ <remoteSysName>ROADMC01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
</measurements>
<resource>
<device>
- <node-id>ROADMA</node-id>
+ <node-id>ROADMA01</node-id>
</device>
<resourceType>
<type>interface</type>
</measurements>
<resource>
<device>
- <node-id>ROADMA</node-id>
+ <node-id>ROADMA01</node-id>
</device>
<resourceType>
<type>interface</type>
</measurements>
<resource>
<device>
- <node-id>ROADMA</node-id>
+ <node-id>ROADMA01</node-id>
</device>
<resourceType>
<type>interface</type>
</measurements>
<resource>
<device>
- <node-id>ROADMA</node-id>
+ <node-id>ROADMA01</node-id>
</device>
<resourceType>
<type>interface</type>
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>ROADMA</node-id>
+ <node-id>ROADMA01</node-id>
<node-number>2</node-number>
<node-type>rdm</node-type>
<clli>NodeA</clli>
<nbr-list>
<if-name>
<ifName>eth-2/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMC</remoteSysName>
+ <remoteSysName>ROADMC01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
<nbr-list>
<if-name>
<ifName>eth-2/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMA</remoteSysName>
+ <remoteSysName>ROADMA01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
</if-name>
<if-name>
<ifName>eth-3/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMC</remoteSysName>
+ <remoteSysName>ROADMC01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
</netconf>
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>ROADMC</node-id>
+ <node-id>ROADMC01</node-id>
<node-number>2</node-number>
<node-type>rdm</node-type>
<clli>NodeC</clli>
<nbr-list>
<if-name>
<ifName>eth-3/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMA</remoteSysName>
+ <remoteSysName>ROADMA01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
</measurements>
<resource>
<device>
- <node-id>ROADMC</node-id>
+ <node-id>ROADMC01</node-id>
</device>
<resourceType>
<type>interface</type>
</measurements>
<resource>
<device>
- <node-id>ROADMC</node-id>
+ <node-id>ROADMC01</node-id>
</device>
<resourceType>
<type>interface</type>
</measurements>
<resource>
<device>
- <node-id>ROADMC</node-id>
+ <node-id>ROADMC01</node-id>
</device>
<resourceType>
<type>interface</type>
</measurements>
<resource>
<device>
- <node-id>ROADMC</node-id>
+ <node-id>ROADMC01</node-id>
</device>
<resourceType>
<type>interface</type>
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>ROADMC</node-id>
+ <node-id>ROADMC01</node-id>
<node-number>2</node-number>
<node-type>rdm</node-type>
<clli>NodeC</clli>
<nbr-list>
<if-name>
<ifName>eth-3/0/ETH-PLUG</ifName>
- <remoteSysName>ROADMA</remoteSysName>
+ <remoteSysName>ROADMA01</remoteSysName>
<remoteMgmtAddressSubType>ipV4</remoteMgmtAddressSubType>
<remoteMgmtAddress>1.1.1.1</remoteMgmtAddress>
<remotePortIdSubType>ifalias</remotePortIdSubType>
</netconf>
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>XPDRA</node-id>
+ <node-id>XPDRA01</node-id>
<node-number>1</node-number>
<node-type>xpdr</node-type>
<clli>NodeA</clli>
</netconf>
<org-openroadm-device xmlns="http://org/openroadm/device">
<info>
- <node-id>XPDRC</node-id>
+ <node-id>XPDRC01</node-id>
<node-number>1</node-number>
<node-type>xpdr</node-type>
<clli>NodeC</clli>
# connect netconf devices
def test_01_connect_xpdrA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_02_connect_xpdrC(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRC"
+ "network-topology/topology/topology-netconf/node/XPDRC01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRC",
+ "node-id": "XPDRC01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_03_connect_rdmA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_04_connect_rdmC(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMC"
+ "network-topology/topology/topology-netconf/node/ROADMC01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMC",
+ "node-id": "ROADMC01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRC",
+ "networkutils:xpdr-node": "XPDRC01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMC",
+ "networkutils:rdm-node": "ROADMC01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRC",
+ "networkutils:xpdr-node": "XPDRC01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMC",
+ "networkutils:rdm-node": "ROADMC01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
def test_09_add_omsAttributes_ROADMA_ROADMC(self):
# Config ROADMA-ROADMC oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
def test_10_add_omsAttributes_ROADMC_ROADMA(self):
# Config ROADMC-ROADMA oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
"connection-type": "service",
"service-a-end": {
"service-rate": "100",
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"service-format": "Ethernet",
"clli": "SNJSCAMCJP8",
"tx-direction": {
},
"service-z-end": {
"service-rate": "100",
- "node-id": "XPDRC",
+ "node-id": "XPDRC01",
"service-format": "Ethernet",
"clli": "SNJSCAMCJT4",
"tx-direction": {
def test_13_check_xc1_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_14_check_xc1_ROADMC(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMC/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMC01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
time.sleep(5)
def test_15_check_topo_XPDRA(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA-XPDR1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
time.sleep(3)
def test_16_check_topo_ROADMA_SRG1(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
time.sleep(3)
def test_17_check_topo_ROADMA_DEG1(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-DEG1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "2",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP2-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "2",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP2-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRC",
+ "networkutils:xpdr-node": "XPDRC01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "2",
- "networkutils:rdm-node": "ROADMC",
+ "networkutils:rdm-node": "ROADMC01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP2-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRC",
+ "networkutils:xpdr-node": "XPDRC01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "2",
- "networkutils:rdm-node": "ROADMC",
+ "networkutils:rdm-node": "ROADMC01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP2-TXRX"
}
"connection-type": "service",
"service-a-end": {
"service-rate": "100",
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"service-format": "Ethernet",
"clli": "SNJSCAMCJP8",
"tx-direction": {
},
"service-z-end": {
"service-rate": "100",
- "node-id": "XPDRC",
+ "node-id": "XPDRC01",
"service-format": "Ethernet",
"clli": "SNJSCAMCJT4",
"tx-direction": {
def test_24_check_xc2_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
res['roadm-connections'][0]['destination'])
def test_25_check_topo_XPDRA(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA-XPDR1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
time.sleep(10)
def test_26_check_topo_ROADMA_SRG1(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
def test_27_check_topo_ROADMA_DEG1(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-DEG1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
"connection-type": "service",
"service-a-end": {
"service-rate": "100",
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"service-format": "Ethernet",
"clli": "SNJSCAMCJP8",
"tx-direction": {
},
"service-z-end": {
"service-rate": "100",
- "node-id": "XPDRC",
+ "node-id": "XPDRC01",
"service-format": "Ethernet",
"clli": "SNJSCAMCJT4",
"tx-direction": {
def test_32_check_no_xc_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url, auth=('admin', 'admin'))
time.sleep(2)
def test_33_check_topo_XPDRA(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA-XPDR1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
time.sleep(10)
def test_34_check_topo_ROADMA_SRG1(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
time.sleep(10)
def test_35_check_topo_ROADMA_DEG1(self):
- url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-DEG1"
+ url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1"
.format(self.restconf_baseurl))
response = requests.request(
"GET", url1, auth=('admin', 'admin'))
"connection-type": "roadm-line",
"service-a-end": {
"service-rate": "100",
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"service-format": "OC",
"clli": "SNJSCAMCJP8",
"tx-direction": {
},
"service-z-end": {
"service-rate": "100",
- "node-id": "ROADMC",
+ "node-id": "ROADMC01",
"service-format": "OC",
"clli": "SNJSCAMCJT4",
"tx-direction": {
def test_38_check_xc1_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_39_check_xc1_ROADMC(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMC/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMC01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
"connection-type": "roadm-line",
"service-a-end": {
"service-rate": "100",
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"service-format": "OC",
"clli": "SNJSCAMCJP8",
"tx-direction": {
},
"service-z-end": {
"service-rate": "100",
- "node-id": "ROADMC",
+ "node-id": "ROADMC01",
"service-format": "OC",
"clli": "SNJSCAMCJT4",
"tx-direction": {
def test_42_check_xc2_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_47_get_no_xc_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf"
- "/node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "/node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
"Accept": "application/json"}
print ("trial number {}".format(i))
print("eth service creation")
self.test_11_create_eth_service1()
- print ("check xc in ROADMA")
+ print ("check xc in ROADMA01")
self.test_13_check_xc1_ROADMA()
- print ("check xc in ROADMC")
+ print ("check xc in ROADMC01")
self.test_14_check_xc1_ROADMC()
print ("eth service deletion\n")
self.test_30_delete_eth_service1()
print ("trial number {}".format(i))
print("oc service creation")
self.test_36_create_oc_service1()
- print ("check xc in ROADMA")
+ print ("check xc in ROADMA01")
self.test_38_check_xc1_ROADMA()
- print ("check xc in ROADMC")
+ print ("check xc in ROADMC01")
self.test_39_check_xc1_ROADMC()
print ("oc service deletion\n")
self.test_44_delete_oc_service1()
def test_51_disconnect_XPDRA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_52_disconnect_XPDRC(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRC"
+ "network-topology/topology/topology-netconf/node/XPDRC01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_53_disconnect_ROADMA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_54_disconnect_ROADMC(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMC"
+ "network-topology/topology/topology-netconf/node/ROADMC01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
"request-id": "request-1"
},
"service-a-end": {
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"service-rate": "100",
"clli": "nodeA"
},
def test_01_xpdrA_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_02_xpdrC_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRC"
+ "network-topology/topology/topology-netconf/node/XPDRC01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRC",
+ "node-id": "XPDRC01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_03_rdmA_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_04_rdmC_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMC"
+ "network-topology/topology/topology-netconf/node/ROADMC01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMC",
+ "node-id": "ROADMC01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRC",
+ "networkutils:xpdr-node": "XPDRC01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMC",
+ "networkutils:rdm-node": "ROADMC01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRC",
+ "networkutils:xpdr-node": "XPDRC01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMC",
+ "networkutils:rdm-node": "ROADMC01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(self.restconf_baseurl)
data = {
"input" : {
- "node-id" : "ROADMA",
+ "node-id" : "ROADMA01",
"logical-connection-point" : "DEG1-TTP-TXRX"
}
}
headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADMA',
+ self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADMA01',
res["output"]["result"])
def test_10_create_OTS_ROADMC(self):
url = "{}/operations/transportpce-device-renderer:create-ots-oms".format(self.restconf_baseurl)
data = {
"input" : {
- "node-id" : "ROADMC",
+ "node-id" : "ROADMC01",
"logical-connection-point" : "DEG2-TTP-TXRX"
}
}
headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADMC',
+ self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADMC01',
res["output"]["result"])
def test_11_get_PM_ROADMA(self):
url = "{}/operations/transportpce-olm:get-pm".format(self.restconf_baseurl)
data = {
"input": {
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"resource-type": "interface",
"granularity": "15min",
"resource-identifier": {
url = "{}/operations/transportpce-olm:get-pm".format(self.restconf_baseurl)
data = {
"input": {
- "node-id": "ROADMC",
+ "node-id": "ROADMC01",
"resource-type": "interface",
"granularity": "15min",
"resource-identifier": {
data = {
"input": {
"src-type": "link",
- "link-id": "ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX"
+ "link-id": "ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX"
}
}
headers = {'content-type': 'application/json'}
res["output"]["result"])
self.assertIn({
"spanloss": "6",
- "link-id": "ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX"
+ "link-id": "ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX"
}, res["output"]["spans"])
time.sleep(5)
res["output"]["result"])
self.assertIn({
"spanloss": "15",
- "link-id": "ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX"
+ "link-id": "ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX"
}, res["output"]["spans"])
self.assertIn({
"spanloss": "6",
- "link-id": "ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX"
+ "link-id": "ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX"
}, res["output"]["spans"])
time.sleep(5)
def test_15_get_OTS_DEG1_TTP_TXRX_ROADMA(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG1-TTP-TXRX/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG1-TTP-TXRX/"
"org-openroadm-optical-transport-interfaces:ots".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_16_get_OTS_DEG2_TTP_TXRX_ROADMC(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMC/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG2-TTP-TXRX/"
+ "node/ROADMC01/yang-ext:mount/org-openroadm-device:org-openroadm-device/interface/OTS-DEG2-TTP-TXRX/"
"org-openroadm-optical-transport-interfaces:ots".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
{
"dest-tp": "XPDR1-NETWORK1",
"src-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
},
{
"dest-tp": "DEG1-TTP-TXRX",
"src-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
},
{
"dest-tp": "SRG1-PP1-TXRX",
"src-tp": "DEG2-TTP-TXRX",
- "node-id": "ROADMC"
+ "node-id": "ROADMC01"
},
{
"dest-tp": "XPDR1-CLIENT1",
"src-tp": "XPDR1-NETWORK1",
- "node-id": "XPDRC"
+ "node-id": "XPDRC01"
}
]
}
{
"dest-tp": "XPDR1-NETWORK1",
"src-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRC"
+ "node-id": "XPDRC01"
},
{
"dest-tp": "DEG2-TTP-TXRX",
"src-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMC"
+ "node-id": "ROADMC01"
},
{
"src-tp": "DEG1-TTP-TXRX",
"dest-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
},
{
"src-tp": "XPDR1-NETWORK1",
"dest-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
}
]
}
{
"dest-tp": "XPDR1-NETWORK1",
"src-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
},
{
"dest-tp": "DEG1-TTP-TXRX",
"src-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
},
{
"dest-tp": "SRG1-PP1-TXRX",
"src-tp": "DEG2-TTP-TXRX",
- "node-id": "ROADMC"
+ "node-id": "ROADMC01"
},
{
"dest-tp": "XPDR1-CLIENT1",
"src-tp": "XPDR1-NETWORK1",
- "node-id": "XPDRC"
+ "node-id": "XPDRC01"
}
]
}
self.assertIn('Success', res["output"]["result"])
def test_20_get_interface_XPDRA_XPDR1_NETWORK1(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK1-1/"
"org-openroadm-optical-channel-interfaces:och".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number'])
def test_21_get_roadmconnection_ROADMA(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/roadm-connections/"
"SRG1-PP1-TXRX-DEG1-TTP-TXRX-1".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
self.assertEqual(-3, res['roadm-connections'][0]['target-output-power'])
def test_22_get_roadmconnection_ROADMC(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/roadm-connections/"
"DEG2-TTP-TXRX-SRG1-PP1-TXRX-1".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
{
"dest-tp": "XPDR1-NETWORK1",
"src-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRC"
+ "node-id": "XPDRC01"
},
{
"dest-tp": "DEG2-TTP-TXRX",
"src-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMC"
+ "node-id": "ROADMC01"
},
{
"src-tp": "DEG1-TTP-TXRX",
"dest-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
},
{
"src-tp": "XPDR1-NETWORK1",
"dest-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
}
]
}
self.assertIn('Success', res["output"]["result"])
def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRC/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRC01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK1-1/"
"org-openroadm-optical-channel-interfaces:och".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number'])
def test_25_get_roadmconnection_ROADMC(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/roadm-connections/"
"SRG1-PP1-TXRX-DEG2-TTP-TXRX-1".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
{
"dest-tp": "XPDR1-NETWORK1",
"src-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
},
{
"dest-tp": "DEG1-TTP-TXRX",
"src-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
},
{
"dest-tp": "SRG1-PP1-TXRX",
"src-tp": "DEG2-TTP-TXRX",
- "node-id": "ROADMC"
+ "node-id": "ROADMC01"
},
{
"dest-tp": "XPDR1-CLIENT1",
"src-tp": "XPDR1-NETWORK1",
- "node-id": "XPDRC"
+ "node-id": "XPDRC01"
}
]
}
self.assertIn('Success', res["output"]["result"])
def test_27_get_roadmconnection_ROADMA(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/roadm-connections/"
"SRG1-PP1-TXRX-DEG1-TTP-TXRX-1".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
self.assertEqual(-60, res['roadm-connections'][0]['target-output-power'])
def test_28_get_roadmconnection_ROADMC(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMC01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/roadm-connections/"
"DEG2-TTP-TXRX-SRG1-PP1-TXRX-1".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
{
"dest-tp": "XPDR1-NETWORK1",
"src-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
},
{
"dest-tp": "DEG1-TTP-TXRX",
"src-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
},
{
"dest-tp": "SRG1-PP1-TXRX",
"src-tp": "DEG2-TTP-TXRX",
- "node-id": "ROADMC"
+ "node-id": "ROADMC01"
},
{
"dest-tp": "XPDR1-CLIENT1",
"src-tp": "XPDR1-NETWORK1",
- "node-id": "XPDRC"
+ "node-id": "XPDRC01"
}
]
}
{
"dest-tp": "XPDR1-NETWORK1",
"src-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRC"
+ "node-id": "XPDRC01"
},
{
"dest-tp": "DEG2-TTP-TXRX",
"src-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMC"
+ "node-id": "ROADMC01"
},
{
"src-tp": "DEG1-TTP-TXRX",
"dest-tp": "SRG1-PP1-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
},
{
"src-tp": "XPDR1-NETWORK1",
"dest-tp": "XPDR1-CLIENT1",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
}
]
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "2",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP2-TXRX"
}
data = {
"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "2",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP2-TXRX"
}
{
"dest-tp": "XPDR1-NETWORK2",
"src-tp": "XPDR1-CLIENT2",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
},
{
"dest-tp": "DEG1-TTP-TXRX",
"src-tp": "SRG1-PP2-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
}
]
}
time.sleep(10)
def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA/yang-ext:mount/"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/XPDRA01/yang-ext:mount/"
"org-openroadm-device:org-openroadm-device/interface/XPDR1-NETWORK2-2/"
"org-openroadm-optical-channel-interfaces:och".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
{
"dest-tp": "XPDR1-NETWORK2",
"src-tp": "XPDR1-CLIENT2",
- "node-id": "XPDRA"
+ "node-id": "XPDRA01"
},
{
"dest-tp": "DEG1-TTP-TXRX",
"src-tp": "SRG1-PP2-TXRX",
- "node-id": "ROADMA"
+ "node-id": "ROADMA01"
}
]
}
def test_36_xpdrA_device_disconnected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_37_xpdrC_device_disconnected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRC"
+ "network-topology/topology/topology-netconf/node/XPDRC01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_39_rdmA_device_disconnected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_40_rdmC_device_disconnected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMC"
+ "network-topology/topology/topology-netconf/node/ROADMC01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
# Get existing nodeId
def test_02_get_nodeId(self):
- url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+ url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
"Accept": "application/json"}
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
self.assertEqual(
- res['node'][0]['node-id'], 'ROADMA-SRG1')
+ res['node'][0]['node-id'], 'ROADMA01-SRG1')
time.sleep(1)
# Get existing linkId
def test_03_get_linkId(self):
- url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX"
+ url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
"Accept": "application/json"}
res = response.json()
self.assertEqual(
res['ietf-network-topology:link'][0]['link-id'],
- 'XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX')
+ 'XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX')
time.sleep(1)
# Path Computation success
"request-id": "request-1"
},
"service-a-end": {
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"service-rate": "0",
"clli": "nodeA"
},
"service-z-end": {
- "node-id": "XPDRC",
+ "node-id": "XPDRC01",
"service-rate": "0",
"clli": "nodeC"
}
"request-id": "request-1"
},
"service-a-end": {
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"service-rate": "0",
"clli": "nodeA"
},
"service-z-end": {
- "node-id": "ROADMC",
+ "node-id": "ROADMC01",
"service-rate": "0",
"clli": "nodeC"
}
# Test deleted topology
def test_07_test_topology_simple_bi_deleted(self):
- url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+ url = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json',
"Accept": "application/json"}
def test_01_rdm_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_02_rdm_device_connected(self):
url = ("{}/operational/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_03_rdm_portmapping_info(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/ROADMA/node-info"
+ "nodes/ROADMA01/node-info"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_04_rdm_portmapping_DEG1_TTP_TXRX(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/ROADMA/mapping/DEG1-TTP-TXRX"
+ "nodes/ROADMA01/mapping/DEG1-TTP-TXRX"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_05_rdm_portmapping_SRG1_PP7_TXRX(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/ROADMA/mapping/SRG1-PP7-TXRX"
+ "nodes/ROADMA01/mapping/SRG1-PP7-TXRX"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_06_rdm_portmapping_SRG3_PP1_TXRX(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/ROADMA/mapping/SRG3-PP1-TXRX"
+ "nodes/ROADMA01/mapping/SRG3-PP1-TXRX"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_07_xpdr_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_08_xpdr_device_connected(self):
url = ("{}/operational/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_09_xpdr_portmapping_info(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA/node-info"
+ "nodes/XPDRA01/node-info"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_10_xpdr_portmapping_NETWORK1(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA/mapping/XPDR1-NETWORK1"
+ "nodes/XPDRA01/mapping/XPDR1-NETWORK1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_11_xpdr_portmapping_NETWORK2(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA/mapping/XPDR1-NETWORK2"
+ "nodes/XPDRA01/mapping/XPDR1-NETWORK2"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_12_xpdr_portmapping_CLIENT1(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA/mapping/XPDR1-CLIENT1"
+ "nodes/XPDRA01/mapping/XPDR1-CLIENT1"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_13_xpdr_portmapping_CLIENT2(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA/mapping/XPDR1-CLIENT2"
+ "nodes/XPDRA01/mapping/XPDR1-CLIENT2"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_14_xpdr_portmapping_CLIENT3(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA/mapping/XPDR1-CLIENT3"
+ "nodes/XPDRA01/mapping/XPDR1-CLIENT3"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_15_xpdr_portmapping_CLIENT4(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA/mapping/XPDR1-CLIENT4"
+ "nodes/XPDRA01/mapping/XPDR1-CLIENT4"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_16_xpdr_device_disconnected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_17_xpdr_device_disconnected(self):
url = ("{}/operational/network-topology:network-topology/topology/"
- "topology-netconf/node/XPDRA".format(self.restconf_baseurl))
+ "topology-netconf/node/XPDRA01".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
res['errors']['error'])
def test_18_xpdr_device_disconnected(self):
- url = ("{}/config/transportpce-portmapping:network/nodes/XPDRA".format(self.restconf_baseurl))
+ url = ("{}/config/transportpce-portmapping:network/nodes/XPDRA01".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
res['errors']['error'])
def test_19_rdm_device_disconnected(self):
- url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA"
+ url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
time.sleep(20)
def test_20_rdm_device_disconnected(self):
- url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA"
+ url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
res['errors']['error'])
def test_21_rdm_device_disconnected(self):
- url = ("{}/config/transportpce-portmapping:network/nodes/ROADMA".format(self.restconf_baseurl))
+ url = ("{}/config/transportpce-portmapping:network/nodes/ROADMA01".format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
"GET", url, headers=headers, auth=('admin', 'admin'))
def test_01_rdm_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_02_xpdr_device_connected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_03_rdm_portmapping(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/ROADMA"
+ "nodes/ROADMA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_04_xpdr_portmapping(self):
url = ("{}/config/transportpce-portmapping:network/"
- "nodes/XPDRA"
+ "nodes/XPDRA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
"renderer:modulation-format": "qpsk",
"renderer:operation": "create",
"renderer:nodes": [
- {"renderer:node-id": "ROADMA",
+ {"renderer:node-id": "ROADMA01",
"renderer:src-tp": "SRG1-PP7-TXRX",
"renderer:dest-tp": "DEG1-TTP-TXRX"},
- {"renderer:node-id": "XPDRA",
+ {"renderer:node-id": "XPDRA01",
"renderer:src-tp": "XPDR1-CLIENT1",
"renderer:dest-tp": "XPDR1-NETWORK1"}]}}
headers = {'content-type': 'application/json'}
headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertIn('Roadm-connection successfully created for nodes: ROADMA', res["output"]["result"])
+ self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"])
def test_06_service_path_create_rdm_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/DEG1-TTP-TXRX-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_07_service_path_create_rdm_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/SRG1-PP7-TXRX-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_08_service_path_create_rdm_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_09_service_path_create_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-NETWORK1-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_10_service_path_create_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-NETWORK1-OTU"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_11_service_path_create_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-NETWORK1-ODU"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_12_service_path_create_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-CLIENT1-ETHERNET"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_13_service_path_create_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"circuit-packs/1%2F0%2F1-PLUG-NET"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
"renderer:wave-number": "7",
"renderer:operation": "delete",
"renderer:nodes": [
- {"renderer:node-id": "ROADMA",
+ {"renderer:node-id": "ROADMA01",
"renderer:src-tp": "SRG1-PP7-TXRX",
"renderer:dest-tp": "DEG1-TTP-TXRX"},
- {"renderer:node-id": "XPDRA",
+ {"renderer:node-id": "XPDRA01",
"renderer:src-tp": "XPDR1-CLIENT1",
"renderer:dest-tp": "XPDR1-NETWORK1"}]}}
headers = {'content-type': 'application/json'}
def test_15_service_path_delete_rdm_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/DEG1-TTP-TXRX-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_16_service_path_delete_rdm_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/SRG1-PP7-TXRX-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_17_service_path_delete_rdm_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_18_service_path_delete_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-NETWORK1-7"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_19_service_path_delete_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-NETWORK1-OTU"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_20_service_path_delete_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-NETWORK1-ODU"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_21_service_path_delete_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"interface/XPDR1-CLIENT1-ETHERNET"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_22_service_path_delete_xpdr_check(self):
url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
- "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+ "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
"circuit-packs/1%2F0%2F1-PLUG-NET"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
def test_23_rdm_device_disconnected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_24_xpdr_device_disconnected(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
headers = {'content-type': 'application/json'}
response = requests.request(
def test_01_connect_rdm(self):
#Config ROADMA
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
#Disconnect the ROADMA
def test_03_disconnect_rdm(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {}
headers = {'content-type': 'application/json'}
def test_04_connect_xpdr(self):
#Config XPDRA
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
#Disconnect the XPDRA
def test_06_disconnect_device(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {}
headers = {'content-type': 'application/json'}
def test_01_connect_ROADMA(self):
#Config ROADMA
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMA",
+ "node-id": "ROADMA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
"GET", url, headers=headers, auth=('admin', 'admin'))
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertEqual(res['network'][0]['node'][0]['node-id'],'ROADMA')
+ self.assertEqual(res['network'][0]['node'][0]['node-id'],'ROADMA01')
self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['network-ref'],'clli-network')
self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['node-ref'],'NodeA')
self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:node-type'],'ROADM')
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
self.assertEqual(nbLink,10)
- expressLink=['ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX','ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX']
- addLink=['ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',
- 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX']
- dropLink=['ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX',
- 'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX']
+ expressLink=['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX','ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX']
+ addLink=['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+ 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX']
+ dropLink=['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+ 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX']
for i in range(0,nbLink):
linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id']
if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'):
self.assertEqual(response.status_code, requests.codes.ok)
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,4)
- listNode=['ROADMA-SRG1','ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2']
+ listNode=['ROADMA01-SRG1','ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2']
for i in range(0,nbNode):
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
nodeId=res['network'][0]['node'][i]['node-id']
- if(nodeId=='ROADMA-SRG1'):
+ if(nodeId=='ROADMA01-SRG1'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG3'):
+ elif(nodeId=='ROADMA01-SRG3'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG1'):
+ elif(nodeId=='ROADMA01-DEG1'):
#Test related to DEG1
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG2'):
+ elif(nodeId=='ROADMA01-DEG2'):
#Test related to DEG2
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
def test_06_connect_XPDRA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "XPDRA",
+ "node-id": "XPDRA01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['network-ref'],'clli-network')
self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA')
nodeId=res['network'][0]['node'][i]['node-id']
- if(nodeId=='XPDRA'):
+ if(nodeId=='XPDRA01'):
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'1')
- elif(nodeId=='ROADMA'):
+ elif(nodeId=='ROADMA01'):
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2')
else:
self.assertEqual(response.status_code, requests.codes.ok)
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,5)
- listNode=['XPDRA-XPDR1','ROADMA-SRG1','ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2']
+ listNode=['XPDRA01-XPDR1','ROADMA01-SRG1','ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2']
for i in range(0,nbNode):
nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
nodeId=res['network'][0]['node'][i]['node-id']
#Tests related to XPDRA nodes
- if(nodeId=='XPDRA-XPDR1'):
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
+ if(nodeId=='XPDRA01-XPDR1'):
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(nodeType,'XPONDER')
nbTps=len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertTrue(client == 4)
self.assertTrue(network == 2)
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG1'):
+ elif(nodeId=='ROADMA01-SRG1'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG3'):
+ elif(nodeId=='ROADMA01-SRG3'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG1'):
+ elif(nodeId=='ROADMA01-DEG1'):
#Test related to DEG1
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG2'):
+ elif(nodeId=='ROADMA01-DEG2'):
#Test related to DEG2
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
else:
.format(self.restconf_baseurl))
data = {"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
.format(self.restconf_baseurl))
data = {"networkutils:input": {
"networkutils:links-input": {
- "networkutils:xpdr-node": "XPDRA",
+ "networkutils:xpdr-node": "XPDRA01",
"networkutils:xpdr-num": "1",
"networkutils:network-num": "1",
- "networkutils:rdm-node": "ROADMA",
+ "networkutils:rdm-node": "ROADMA01",
"networkutils:srg-num": "1",
"networkutils:termination-point-num": "SRG1-PP1-TXRX"
}
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
self.assertEqual(nbLink,12)
- expressLink=['ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX','ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX']
- addLink=['ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',
- 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX']
- dropLink=['ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX',
- 'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX']
- XPDR_IN=['ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1']
- XPDR_OUT=['XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX']
+ expressLink=['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX','ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX']
+ addLink=['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+ 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX']
+ dropLink=['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+ 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX']
+ XPDR_IN=['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
+ XPDR_OUT=['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX']
for i in range(0,nbLink):
nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']
linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id']
def test_13_connect_ROADMC(self):
#Config ROADMC
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMC"
+ "network-topology/topology/topology-netconf/node/ROADMC01"
.format(self.restconf_baseurl))
data = {"node": [{
- "node-id": "ROADMC",
+ "node-id": "ROADMC01",
"netconf-node-topology:username": "admin",
"netconf-node-topology:password": "admin",
"netconf-node-topology:host": "127.0.0.1",
def test_14_omsAttributes_ROADMA_ROADMC(self):
# Config ROADMA-ROADMC oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
self.assertEqual(response.status_code, requests.codes.created)
def test_15_omsAttributes_ROADMC_ROADMA(self):
- # Config ROADMC-ROADMA oms-attributes
+ # Config ROADMC01-ROADMA oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
res = response.json()
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,3)
- listNode=['XPDRA','ROADMA','ROADMC']
+ listNode=['XPDRA01','ROADMA01','ROADMC01']
for i in range(0,nbNode):
self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['network-ref'],'clli-network')
nodeId=res['network'][0]['node'][i]['node-id']
- if(nodeId=='XPDRA'):
+ if(nodeId=='XPDRA01'):
self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'1')
listNode.remove(nodeId)
- elif(nodeId=='ROADMA'):
+ elif(nodeId=='ROADMA01'):
self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2')
listNode.remove(nodeId)
- elif(nodeId=='ROADMC'):
+ elif(nodeId=='ROADMC01'):
self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeC')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM')
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2')
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
self.assertEqual(nbLink,20)
- expressLink=['ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX','ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX',
- 'ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX','ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX']
- addLink=['ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',
- 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',
- 'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX','ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX']
- dropLink=['ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX',
- 'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX',
- 'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX','ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX']
- R2RLink=['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX','ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX']
- XPDR_IN=['ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1']
- XPDR_OUT=['XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX']
+ expressLink=['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX','ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX',
+ 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX','ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX']
+ addLink=['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+ 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+ 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX','ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX']
+ dropLink=['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+ 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX',
+ 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX','ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX']
+ R2RLink=['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX','ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX']
+ XPDR_IN=['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
+ XPDR_OUT=['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX']
for i in range(0,nbLink):
nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']
linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id']
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
self.assertEqual(nbLink,20)
- R2RLink=['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX',
- 'ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX']
+ R2RLink=['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
+ 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX']
for i in range(0,nbLink):
nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']
link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id']
self.assertEqual(response.status_code, requests.codes.ok)
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,8)
- listNode=['XPDRA-XPDR1',
- 'ROADMA-SRG1','ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2',
- 'ROADMC-SRG1','ROADMC-DEG1','ROADMC-DEG2']
+ listNode=['XPDRA01-XPDR1',
+ 'ROADMA01-SRG1','ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2',
+ 'ROADMC01-SRG1','ROADMC01-DEG1','ROADMC01-DEG2']
#************************Tests related to XPDRA nodes
for i in range(0,nbNode):
nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
nodeId=res['network'][0]['node'][i]['node-id']
- if(nodeId=='XPDRA-XPDR1'):
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
+ if(nodeId=='XPDRA01-XPDR1'):
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(nodeType,'XPONDER')
nbTps=len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertTrue(client == 4)
self.assertTrue(network == 2)
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG1'):
+ elif(nodeId=='ROADMA01-SRG1'):
#Test related to SRG1
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG')
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG3'):
+ elif(nodeId=='ROADMA01-SRG3'):
#Test related to SRG1
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG')
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG1'):
+ elif(nodeId=='ROADMA01-DEG1'):
#Test related to DEG1
self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG2'):
+ elif(nodeId=='ROADMA01-DEG2'):
#Test related to DEG2
self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
listNode.remove(nodeId)
- elif(nodeId=='ROADMC-SRG1'):
+ elif(nodeId=='ROADMC01-SRG1'):
#Test related to SRG1
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG')
listNode.remove(nodeId)
- elif(nodeId=='ROADMC-DEG1'):
+ elif(nodeId=='ROADMC01-DEG1'):
#Test related to DEG1
self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
listNode.remove(nodeId)
- elif(nodeId=='ROADMC-DEG2'):
+ elif(nodeId=='ROADMC01-DEG2'):
#Test related to DEG2
self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'},
res['network'][0]['node'][i]['supporting-node'])
self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE')
listNode.remove(nodeId)
def test_22_omsAttributes_ROADMA_ROADMB(self):
# Config ROADMA-ROADMB oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
def test_23_omsAttributes_ROADMB_ROADMA(self):
# Config ROADMB-ROADMA oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
def test_24_omsAttributes_ROADMB_ROADMC(self):
# Config ROADMB-ROADMC oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
self.assertEqual(response.status_code, requests.codes.created)
def test_25_omsAttributes_ROADMC_ROADMB(self):
- # Config ROADMC-ROADMB oms-attributes
+ # Config ROADMC01-ROADMB oms-attributes
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
+ "link/ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
"OMS-attributes/span"
.format(self.restconf_baseurl))
data = {"span": {
res = response.json()
#Tests related to links
nbLink=len(res['network'][0]['ietf-network-topology:link'])
- listR2RLink=['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX','ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX',
- 'ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX','ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX',
- 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX','ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX']
+ listR2RLink=['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX','ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX',
+ 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX','ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX',
+ 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX','ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX']
for i in range(0,nbLink):
if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] == 'ROADM-TO-ROADM':
link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id']
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
nbLink=len(res['network'][0]['ietf-network-topology:link'])
- R2RLink = ['ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX',
- 'ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX',
- 'ROADMA-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX',
- 'ROADMC-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX',
- 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA-DEG2-DEG2-TTP-TXRX',
- 'ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC-DEG1-DEG1-TTP-TXRX']
+ R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
+ 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX',
+ 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX',
+ 'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX',
+ 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX',
+ 'ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX']
for i in range(0,nbLink):
nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']
link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id']
def test_31_disconnect_ROADMC(self):
#Delete in the topology-netconf
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMC"
+ "network-topology/topology/topology-netconf/node/ROADMC01"
.format(self.restconf_baseurl))
data = {}
headers = {'content-type': 'application/json'}
self.assertEqual(response.status_code, requests.codes.ok)
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,5)
- listNode=['XPDRA-XPDR1','ROADMA-SRG1', 'ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2']
+ listNode=['XPDRA01-XPDR1','ROADMA01-SRG1', 'ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2']
for i in range(0,nbNode):
nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
nodeId=res['network'][0]['node'][i]['node-id']
#Tests related to XPDRA nodes
- if(nodeId=='XPDRA-XPDR1'):
+ if(nodeId=='XPDRA01-XPDR1'):
nbTp = len(res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
for j in range(0, nbTp):
tpid = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id']
self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
['org-openroadm-network-topology:xpdr-client-attributes']['tail-equipment-id'],
'XPDR1-NETWORK1')
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG1'):
+ elif(nodeId=='ROADMA01-SRG1'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG3'):
+ elif(nodeId=='ROADMA01-SRG3'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG1'):
+ elif(nodeId=='ROADMA01-DEG1'):
#Test related to DEG1
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG2'):
+ elif(nodeId=='ROADMA01-DEG2'):
#Test related to DEG2
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
listNode.remove(nodeId)
else:
self.assertEqual(len(listNode),0)
#Test related to SRG1 of ROADMC
for i in range(0,nbNode):
- self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-SRG1')
- self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-DEG1')
- self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC-DEG2')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01-SRG1')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01-DEG1')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01-DEG2')
def test_33_getOpenRoadmNetwork(self):
url = ("{}/config/ietf-network:networks/network/openroadm-network"
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,2)
for i in range(0,nbNode-1):
- self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01')
self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMB')
def test_34_getClliNetwork(self):
def test_35_disconnect_XPDRA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/XPDRA"
+ "network-topology/topology/topology-netconf/node/XPDRA01"
.format(self.restconf_baseurl))
data = {}
headers = {'content-type': 'application/json'}
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,1)
for i in range(0,nbNode):
- self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'XPDRA')
+ self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'XPDRA01')
def test_38_getNodes_OpenRoadmTopology(self):
url = ("{}/config/ietf-network:networks/network/openroadm-topology"
self.assertEqual(response.status_code, requests.codes.ok)
nbNode=len(res['network'][0]['node'])
self.assertEqual(nbNode,4)
- listNode=['ROADMA-SRG1','ROADMA-SRG3','ROADMA-DEG1','ROADMA-DEG2']
+ listNode=['ROADMA01-SRG1','ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2']
for i in range(0,nbNode):
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA'},
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'},
res['network'][0]['node'][i]['supporting-node'])
nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type']
nodeId=res['network'][0]['node'][i]['node-id']
- if(nodeId=='ROADMA-SRG1'):
+ if(nodeId=='ROADMA01-SRG1'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-SRG3'):
+ elif(nodeId=='ROADMA01-SRG3'):
#Test related to SRG1
self.assertEqual(nodeType,'SRG')
self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17)
self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG1'):
+ elif(nodeId=='ROADMA01-DEG1'):
#Test related to DEG1
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'},
res['network'][0]['node'][i]['ietf-network-topology:termination-point'])
listNode.remove(nodeId)
- elif(nodeId=='ROADMA-DEG2'):
+ elif(nodeId=='ROADMA01-DEG2'):
#Test related to DEG2
self.assertEqual(nodeType,'DEGREE')
self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'},
def test_39_disconnect_ROADM_XPDRA_link(self):
#Link-1
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX"
+ "link/XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX"
.format(self.restconf_baseurl))
data = {}
headers = {'content-type': 'application/json'}
self.assertEqual(response.status_code, requests.codes.ok)
#Link-2
url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
- "link/ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1"
+ "link/ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1"
.format(self.restconf_baseurl))
data = {}
headers = {'content-type': 'application/json'}
res = response.json()
nbLink=len(res['network'][0]['ietf-network-topology:link'])
self.assertEqual(nbLink,16)
- expressLink=['ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX','ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX']
- addLink=['ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG1-SRG1-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX',
- 'ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG2-DEG2-CTP-TXRX','ROADMA-SRG3-SRG3-CP-TXRXtoROADMA-DEG1-DEG1-CTP-TXRX']
- dropLink=['ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG1-SRG1-CP-TXRX',
- 'ROADMA-DEG1-DEG1-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX','ROADMA-DEG2-DEG2-CTP-TXRXtoROADMA-SRG3-SRG3-CP-TXRX']
+ expressLink=['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX','ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX']
+ addLink=['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
+ 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX','ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX']
+ dropLink=['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX',
+ 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX']
roadmtoroadmLink = 0
for i in range(0,nbLink):
if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'):
def test_41_disconnect_ROADMA(self):
url = ("{}/config/network-topology:"
- "network-topology/topology/topology-netconf/node/ROADMA"
+ "network-topology/topology/topology-netconf/node/ROADMA01"
.format(self.restconf_baseurl))
data = {}
headers = {'content-type': 'application/json'}
Code Review / transportpce.git / commitdiff