From ea94e75a0693ee4283843998d37cbeccb9276b58 Mon Sep 17 00:00:00 2001 From: ID Bot Date: Thu, 19 Jan 2023 21:21:10 +0000 Subject: [PATCH] Script updating gh-pages from 1769f27. [ci skip] --- draft-ietf-ccamp-mw-topo-yang.html | 416 ++++++++++++----------------- draft-ietf-ccamp-mw-topo-yang.txt | 397 +++++++++++---------------- 2 files changed, 326 insertions(+), 487 deletions(-) diff --git a/draft-ietf-ccamp-mw-topo-yang.html b/draft-ietf-ccamp-mw-topo-yang.html index 7735385..6ca1b48 100644 --- a/draft-ietf-ccamp-mw-topo-yang.html +++ b/draft-ietf-ccamp-mw-topo-yang.html @@ -1046,7 +1046,7 @@ Ahlberg, et al. -Expires 22 July 2023 +Expires 23 July 2023 [Page] @@ -1059,12 +1059,12 @@
draft-ietf-ccamp-mw-topo-yang-latest
Published:
- +
Intended Status:
Standards Track
Expires:
-
+
Authors:
@@ -1126,7 +1126,7 @@

time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."

- This Internet-Draft will expire on 22 July 2023.

+ This Internet-Draft will expire on 23 July 2023.

This example shows a 2+0 mode for a bonded configuration.

-
<CODE BEGINS> file "example2plus0-f.json"
-
-=============== NOTE: '\' line wrapping per RFC 8792 ================
-
+
 {
+  "ietf-interfaces:interfaces": {
+    "interface": [
+      {
+        "name": "L2Interface1",
+        "description": "'Ethernet Interface 1'",
+        "type": "iana-if-type:ethernetCsmacd"
+      },
+      {
+        "name": "L2Interface2",
+        "description": "'Ethernet Interface 2'",
+        "type": "iana-if-type:ethernetCsmacd"
+      },
+      {
+        "name": "RLT-1",
+        "description": "'Radio Link Terminal 1'",
+        "type": "iana-if-type:microwaveRadioLinkTerminal",
+        "ietf-microwave-radio-link:mode":
+           "ietf-microwave-types:two-plus-zero",
+        "ietf-microwave-radio-link:carrier-terminations": [
+          "CT-1",
+          "CT-3"
+        ]
+      },
+      {
+        "name": "RLT-2",
+        "description": "'Radio Link Terminal 2'",
+        "type": "iana-if-type:microwaveRadioLinkTerminal",
+        "ietf-microwave-radio-link:mode":
+           "ietf-microwave-types:two-plus-zero",
+        "ietf-microwave-radio-link:carrier-terminations": [
+          "CT-2",
+          "CT-4"
+        ]
+      },
+      {
+        "name": "CT-1",
+        "description": "'Carrier Termination 1'",
+        "type": "iana-if-type:microwaveCarrierTermination",
+        "ietf-microwave-radio-link:tx-frequency": 10728000,
+        "ietf-microwave-radio-link:duplex-distance": 644000,
+        "ietf-microwave-radio-link:channel-separation": 28000,
+        "ietf-microwave-radio-link:rtpc": {
+          "maximum-nominal-power": "20.0"
+        },
+        "ietf-microwave-radio-link:single": {
+          "selected-cm": "ietf-microwave-types:qam-512"
+        }
+      },
+      {
+        "name": "CT-3",
+        "description": "'Carrier Termination 3'",
+        "type": "iana-if-type:microwaveCarrierTermination",
+        "ietf-microwave-radio-link:tx-frequency": 10528000,
+        "ietf-microwave-radio-link:duplex-distance": 644000,
+        "ietf-microwave-radio-link:channel-separation": 28000,
+        "ietf-microwave-radio-link:rtpc": {
+          "maximum-nominal-power": "20.0"
+        },
+        "ietf-microwave-radio-link:single": {
+          "selected-cm": "ietf-microwave-types:qam-512"
+        }
+      },
+      {
+        "name": "CT-2",
+        "description": "'Carrier Termination 2'",
+        "type": "iana-if-type:microwaveCarrierTermination",
+        "ietf-microwave-radio-link:tx-frequency": 10615000,
+        "ietf-microwave-radio-link:duplex-distance": 644000,
+        "ietf-microwave-radio-link:channel-separation": 28000,
+        "ietf-microwave-radio-link:rtpc": {
+          "maximum-nominal-power": "20.0"
+        },
+        "ietf-microwave-radio-link:single": {
+          "selected-cm": "ietf-microwave-types:qam-512"
+        }
+      },
+      {
+        "name": "CT-4",
+        "description": "'Carrier Termination 4'",
+        "type": "iana-if-type:microwaveCarrierTermination",
+        "ietf-microwave-radio-link:tx-frequency": 10415000,
+        "ietf-microwave-radio-link:duplex-distance": 644000,
+        "ietf-microwave-radio-link:channel-separation": 28000,
+        "ietf-microwave-radio-link:rtpc": {
+          "maximum-nominal-power": "20.0"
+        },
+        "ietf-microwave-radio-link:single": {
+          "selected-cm": "ietf-microwave-types:qam-512"
+        }
+      }
+    ]
+  },
   "ietf-network:networks": {
     "network": [
       {
         "network-id": "L2-network",
         "network-types": {
           "ietf-te-topology:te-topology": {
-            "ietf-eth-te-topology:eth-tran-topology": {
-            }
+            "ietf-eth-te-topology:eth-tran-topology": {}
           }
         },
         "supporting-network": [
@@ -2118,8 +2206,7 @@ 

"network-id": "mw-network", "network-types": { "ietf-te-topology:te-topology": { - "ietf-microwave-topology:mw-topology": { - } + "ietf-microwave-topology:mw-topology": {} } }, "supporting-network": [ @@ -2155,9 +2242,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path":"RLT-1" + } } }, { @@ -2166,9 +2251,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path":"CT-1" + } } }, { @@ -2177,9 +2260,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path":"CT-3" + } } } ] @@ -2211,9 +2292,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path":"RLT-2" + } } }, { @@ -2222,9 +2301,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path":"CT-2" + } } }, { @@ -2233,9 +2310,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path":"CT-4" + } } } ] @@ -2268,23 +2343,11 @@

] }, "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ -ity": - [ - { - "availability": "0.999", - "link-bandwidth": "1572864" - }, - { - "availability": "0.95", - "link-bandwidth": "2097152" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-radio-link": { "rlt-mode": { - "num-bonded-carriers": 2, - "num-protecting-carriers": 0 + "num-bonded-carriers": 2, + "num-protecting-carriers": 0 } } } @@ -2303,14 +2366,6 @@

}, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ -ity": - [ - { - "availability": "0.99", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10728000, @@ -2333,14 +2388,6 @@

}, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ -ity": - [ - { - "availability": "0.99", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10528000, @@ -2354,7 +2401,14 @@

] } ] - }, + } +} +

+
+

This example shows a 1+1 mode for protection.

+
+
+{
   "ietf-interfaces:interfaces": {
     "interface": [
       {
@@ -2372,7 +2426,7 @@ 

"description": "'Radio Link Terminal 1'", "type": "iana-if-type:microwaveRadioLinkTerminal", "ietf-microwave-radio-link:mode": - "ietf-microwave-types:two-plus-zero", + "ietf-microwave-types:one-plus-one", "ietf-microwave-radio-link:carrier-terminations": [ "CT-1", "CT-3" @@ -2383,7 +2437,7 @@

"description": "'Radio Link Terminal 2'", "type": "iana-if-type:microwaveRadioLinkTerminal", "ietf-microwave-radio-link:mode": - "ietf-microwave-types:two-plus-zero", + "ietf-microwave-types:one-plus-one", "ietf-microwave-radio-link:carrier-terminations": [ "CT-2", "CT-4" @@ -2399,22 +2453,24 @@

"ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } }, { "name": "CT-3", "description": "'Carrier Termination 3'", "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10528000, + "ietf-microwave-radio-link:tx-frequency": 10728000, "ietf-microwave-radio-link:duplex-distance": 644000, "ietf-microwave-radio-link:channel-separation": 28000, "ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } }, { @@ -2427,45 +2483,35 @@

"ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } }, { "name": "CT-4", "description": "'Carrier Termination 4'", "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10415000, + "ietf-microwave-radio-link:tx-frequency": 10615000, "ietf-microwave-radio-link:duplex-distance": 644000, "ietf-microwave-radio-link:channel-separation": 28000, "ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } } ] - } -} - -<CODE ENDS>

-
-

This example shows a 1+1 mode for protection.

-
-
<CODE BEGINS> file "example1plus1-f.json"
-
-=============== NOTE: '\' line wrapping per RFC 8792 ================
-
-{
+  },
   "ietf-network:networks": {
     "network": [
       {
         "network-id": "L2-network",
         "network-types": {
           "ietf-te-topology:te-topology": {
-            "ietf-eth-te-topology:eth-tran-topology": {
-            }
+            "ietf-eth-te-topology:eth-tran-topology": {}
           }
         },
         "supporting-network": [
@@ -2541,8 +2587,7 @@ 

"network-id": "mw-network", "network-types": { "ietf-te-topology:te-topology": { - "ietf-microwave-topology:mw-topology": { - } + "ietf-microwave-topology:mw-topology": {} } }, "supporting-network": [ @@ -2578,9 +2623,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path": "RLT-1" + } } }, { @@ -2589,9 +2632,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path": "CT-1" + } } }, { @@ -2600,9 +2641,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path": "CT-3" + } } } ] @@ -2634,9 +2673,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path": "RLT-2" + } } }, { @@ -2645,9 +2682,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path": "CT-2" + } } }, { @@ -2656,9 +2691,7 @@

"ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ -ace-path": "CT-4" + } } } ] @@ -2691,23 +2724,11 @@

] }, "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ -ity": - [ - { - "availability": "0.999", - "link-bandwidth": "998423" - }, - { - "availability": "0.99", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-radio-link": { "rlt-mode": { - "num-bonded-carriers": 1, - "num-protecting-carriers": 1 + "num-bonded-carriers": 1, + "num-protecting-carriers": 1 } } } @@ -2726,18 +2747,6 @@

}, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ -ity": - [ - { - "availability": "0.99", - "link-bandwidth": "998423" - }, - { - "availability": "0.95", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10728000, @@ -2760,18 +2769,6 @@

}, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ -ity": - [ - { - "availability": "0.99", - "link-bandwidth": "998423" - }, - { - "availability": "0.95", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10728000, @@ -2785,111 +2782,34 @@

] } ] - }, - "ietf-interfaces:interfaces": { - "interface": [ - { - "name": "L2Interface1", - "description": "'Ethernet Interface 1'", - "type": "iana-if-type:ethernetCsmacd" - }, - { - "name": "L2Interface2", - "description": "'Ethernet Interface 2'", - "type": "iana-if-type:ethernetCsmacd" - }, - { - "name": "RLT-1", - "description": "'Radio Link Terminal 1'", - "type": "iana-if-type:microwaveRadioLinkTerminal", - "ietf-microwave-radio-link:mode": - "ietf-microwave-types:one-plus-one", - "ietf-microwave-radio-link:carrier-terminations": [ - "CT-1", - "CT-3" - ] - }, - { - "name": "RLT-2", - "description": "'Radio Link Terminal 2'", - "type": "iana-if-type:microwaveRadioLinkTerminal", - "ietf-microwave-radio-link:mode": - "ietf-microwave-types:one-plus-one", - "ietf-microwave-radio-link:carrier-terminations": [ - "CT-2", - "CT-4" - ] - }, - { - "name": "CT-1", - "description": "'Carrier Termination 1'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10728000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - }, - { - "name": "CT-3", - "description": "'Carrier Termination 3'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10728000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - }, - { - "name": "CT-2", - "description": "'Carrier Termination 2'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10615000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - }, - { - "name": "CT-4", - "description": "'Carrier Termination 4'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10615000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - } - - ] } } - - -<CODE ENDS>

+

Note that the examples above show one particular link (unidirectional) and not a complete network topology.

+

This example provides a json snippet that shows geolocation information.

+
+
+   "node": [
+      {
+         "node-id": "mw-N1",
+
+         ...
+
+         "ietf-te-topology:te" : {
+            "ietf-te-topology:geolocation": {
+               "altitude": "200000",
+               "latitude": "45",
+               "longitude": "90"
+               }
+         },
+         "ietf-network-topology:termination-point": [
+
+         ...
+
+
+
diff --git a/draft-ietf-ccamp-mw-topo-yang.txt b/draft-ietf-ccamp-mw-topo-yang.txt index 22e96ef..1afb9c3 100644 --- a/draft-ietf-ccamp-mw-topo-yang.txt +++ b/draft-ietf-ccamp-mw-topo-yang.txt @@ -5,14 +5,14 @@ ccamp J. Ahlberg Internet-Draft S. Mansfield Intended status: Standards Track Ericsson -Expires: 22 July 2023 M. Ye +Expires: 23 July 2023 M. Ye I. Busi Huawei Technologies X. Li NEC Laboratories Europe D. Spreafico Nokia - IT - 18 January 2023 + 19 January 2023 A YANG Data Model for Microwave Topology @@ -45,7 +45,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on 22 July 2023. + This Internet-Draft will expire on 23 July 2023. Copyright Notice @@ -889,18 +889,106 @@ A.2. A topology with single microwave radio link This example shows a 2+0 mode for a bonded configuration. - file "example2plus0-f.json" - =============== NOTE: '\' line wrapping per RFC 8792 ================ - { + "ietf-interfaces:interfaces": { + "interface": [ + { + "name": "L2Interface1", + "description": "'Ethernet Interface 1'", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "L2Interface2", + "description": "'Ethernet Interface 2'", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "RLT-1", + "description": "'Radio Link Terminal 1'", + "type": "iana-if-type:microwaveRadioLinkTerminal", + "ietf-microwave-radio-link:mode": + "ietf-microwave-types:two-plus-zero", + "ietf-microwave-radio-link:carrier-terminations": [ + "CT-1", + "CT-3" + ] + }, + { + "name": "RLT-2", + "description": "'Radio Link Terminal 2'", + "type": "iana-if-type:microwaveRadioLinkTerminal", + "ietf-microwave-radio-link:mode": + "ietf-microwave-types:two-plus-zero", + "ietf-microwave-radio-link:carrier-terminations": [ + "CT-2", + "CT-4" + ] + }, + { + "name": "CT-1", + "description": "'Carrier Termination 1'", + "type": "iana-if-type:microwaveCarrierTermination", + "ietf-microwave-radio-link:tx-frequency": 10728000, + "ietf-microwave-radio-link:duplex-distance": 644000, + "ietf-microwave-radio-link:channel-separation": 28000, + "ietf-microwave-radio-link:rtpc": { + "maximum-nominal-power": "20.0" + }, + "ietf-microwave-radio-link:single": { + "selected-cm": "ietf-microwave-types:qam-512" + } + }, + { + "name": "CT-3", + "description": "'Carrier Termination 3'", + "type": "iana-if-type:microwaveCarrierTermination", + "ietf-microwave-radio-link:tx-frequency": 10528000, + "ietf-microwave-radio-link:duplex-distance": 644000, + "ietf-microwave-radio-link:channel-separation": 28000, + "ietf-microwave-radio-link:rtpc": { + "maximum-nominal-power": "20.0" + }, + "ietf-microwave-radio-link:single": { + "selected-cm": "ietf-microwave-types:qam-512" + } + }, + { + "name": "CT-2", + "description": "'Carrier Termination 2'", + "type": "iana-if-type:microwaveCarrierTermination", + "ietf-microwave-radio-link:tx-frequency": 10615000, + "ietf-microwave-radio-link:duplex-distance": 644000, + "ietf-microwave-radio-link:channel-separation": 28000, + "ietf-microwave-radio-link:rtpc": { + "maximum-nominal-power": "20.0" + }, + "ietf-microwave-radio-link:single": { + "selected-cm": "ietf-microwave-types:qam-512" + } + }, + { + "name": "CT-4", + "description": "'Carrier Termination 4'", + "type": "iana-if-type:microwaveCarrierTermination", + "ietf-microwave-radio-link:tx-frequency": 10415000, + "ietf-microwave-radio-link:duplex-distance": 644000, + "ietf-microwave-radio-link:channel-separation": 28000, + "ietf-microwave-radio-link:rtpc": { + "maximum-nominal-power": "20.0" + }, + "ietf-microwave-radio-link:single": { + "selected-cm": "ietf-microwave-types:qam-512" + } + } + ] + }, "ietf-network:networks": { "network": [ { "network-id": "L2-network", "network-types": { "ietf-te-topology:te-topology": { - "ietf-eth-te-topology:eth-tran-topology": { - } + "ietf-eth-te-topology:eth-tran-topology": {} } }, "supporting-network": [ @@ -976,8 +1064,7 @@ A.2. A topology with single microwave radio link "network-id": "mw-network", "network-types": { "ietf-te-topology:te-topology": { - "ietf-microwave-topology:mw-topology": { - } + "ietf-microwave-topology:mw-topology": {} } }, "supporting-network": [ @@ -1013,9 +1100,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path":"RLT-1" + } } }, { @@ -1024,9 +1109,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path":"CT-1" + } } }, { @@ -1035,9 +1118,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path":"CT-3" + } } } ] @@ -1069,9 +1150,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path":"RLT-2" + } } }, { @@ -1080,9 +1159,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path":"CT-2" + } } }, { @@ -1091,9 +1168,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path":"CT-4" + } } } ] @@ -1126,23 +1201,11 @@ A.2. A topology with single microwave radio link ] }, "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ - ity": - [ - { - "availability": "0.999", - "link-bandwidth": "1572864" - }, - { - "availability": "0.95", - "link-bandwidth": "2097152" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-radio-link": { "rlt-mode": { - "num-bonded-carriers": 2, - "num-protecting-carriers": 0 + "num-bonded-carriers": 2, + "num-protecting-carriers": 0 } } } @@ -1161,14 +1224,6 @@ A.2. A topology with single microwave radio link }, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ - ity": - [ - { - "availability": "0.99", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10728000, @@ -1191,14 +1246,6 @@ A.2. A topology with single microwave radio link }, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ - ity": - [ - { - "availability": "0.99", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10528000, @@ -1212,7 +1259,12 @@ A.2. A topology with single microwave radio link ] } ] - }, + } + } + + This example shows a 1+1 mode for protection. + + { "ietf-interfaces:interfaces": { "interface": [ { @@ -1230,7 +1282,7 @@ A.2. A topology with single microwave radio link "description": "'Radio Link Terminal 1'", "type": "iana-if-type:microwaveRadioLinkTerminal", "ietf-microwave-radio-link:mode": - "ietf-microwave-types:two-plus-zero", + "ietf-microwave-types:one-plus-one", "ietf-microwave-radio-link:carrier-terminations": [ "CT-1", "CT-3" @@ -1241,7 +1293,7 @@ A.2. A topology with single microwave radio link "description": "'Radio Link Terminal 2'", "type": "iana-if-type:microwaveRadioLinkTerminal", "ietf-microwave-radio-link:mode": - "ietf-microwave-types:two-plus-zero", + "ietf-microwave-types:one-plus-one", "ietf-microwave-radio-link:carrier-terminations": [ "CT-2", "CT-4" @@ -1257,22 +1309,24 @@ A.2. A topology with single microwave radio link "ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } }, { "name": "CT-3", "description": "'Carrier Termination 3'", "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10528000, + "ietf-microwave-radio-link:tx-frequency": 10728000, "ietf-microwave-radio-link:duplex-distance": 644000, "ietf-microwave-radio-link:channel-separation": 28000, "ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } }, { @@ -1285,43 +1339,35 @@ A.2. A topology with single microwave radio link "ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } }, { "name": "CT-4", "description": "'Carrier Termination 4'", "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10415000, + "ietf-microwave-radio-link:tx-frequency": 10615000, "ietf-microwave-radio-link:duplex-distance": 644000, "ietf-microwave-radio-link:channel-separation": 28000, "ietf-microwave-radio-link:rtpc": { "maximum-nominal-power": "20.0" }, - "ietf-microwave-radio-link:single": { - "selected-cm": "ietf-microwave-types:qam-512" + "ietf-microwave-radio-link:adaptive": { + "selected-min-acm": "ietf-microwave-types:qam-256", + "selected-max-acm": "ietf-microwave-types:qam-512" } } ] - } - } - - - This example shows a 1+1 mode for protection. - - file "example1plus1-f.json" - =============== NOTE: '\' line wrapping per RFC 8792 ================ - - { + }, "ietf-network:networks": { "network": [ { "network-id": "L2-network", "network-types": { "ietf-te-topology:te-topology": { - "ietf-eth-te-topology:eth-tran-topology": { - } + "ietf-eth-te-topology:eth-tran-topology": {} } }, "supporting-network": [ @@ -1397,8 +1443,7 @@ A.2. A topology with single microwave radio link "network-id": "mw-network", "network-types": { "ietf-te-topology:te-topology": { - "ietf-microwave-topology:mw-topology": { - } + "ietf-microwave-topology:mw-topology": {} } }, "supporting-network": [ @@ -1434,9 +1479,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path": "RLT-1" + } } }, { @@ -1445,9 +1488,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path": "CT-1" + } } }, { @@ -1456,9 +1497,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path": "CT-3" + } } } ] @@ -1490,9 +1529,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-rltp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path": "RLT-2" + } } }, { @@ -1501,9 +1538,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path": "CT-2" + } } }, { @@ -1512,9 +1547,7 @@ A.2. A topology with single microwave radio link "ietf-te-topology:te": { "ietf-microwave-topology:mw-tp-choice": { "microwave-ctp": {} - }, - "ietf-tp-interface-reference-topology:tp-to-interf\ - ace-path": "CT-4" + } } } ] @@ -1547,23 +1580,11 @@ A.2. A topology with single microwave radio link ] }, "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ - ity": - [ - { - "availability": "0.999", - "link-bandwidth": "998423" - }, - { - "availability": "0.99", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-radio-link": { "rlt-mode": { - "num-bonded-carriers": 1, - "num-protecting-carriers": 1 + "num-bonded-carriers": 1, + "num-protecting-carriers": 1 } } } @@ -1582,18 +1603,6 @@ A.2. A topology with single microwave radio link }, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ - ity": - [ - { - "availability": "0.99", - "link-bandwidth": "998423" - }, - { - "availability": "0.95", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10728000, @@ -1616,18 +1625,6 @@ A.2. A topology with single microwave radio link }, "ietf-te-topology:te": { "te-link-attributes": { - "ietf-bandwidth-availability-topology:link-availabil\ - ity": - [ - { - "availability": "0.99", - "link-bandwidth": "998423" - }, - { - "availability": "0.95", - "link-bandwidth": "1048576" - } - ], "ietf-microwave-topology:mw-link-choice": { "microwave-carrier": { "tx-frequency": 10728000, @@ -1641,110 +1638,32 @@ A.2. A topology with single microwave radio link ] } ] - }, - "ietf-interfaces:interfaces": { - "interface": [ - { - "name": "L2Interface1", - "description": "'Ethernet Interface 1'", - "type": "iana-if-type:ethernetCsmacd" - }, - { - "name": "L2Interface2", - "description": "'Ethernet Interface 2'", - "type": "iana-if-type:ethernetCsmacd" - }, - { - "name": "RLT-1", - "description": "'Radio Link Terminal 1'", - "type": "iana-if-type:microwaveRadioLinkTerminal", - "ietf-microwave-radio-link:mode": - "ietf-microwave-types:one-plus-one", - "ietf-microwave-radio-link:carrier-terminations": [ - "CT-1", - "CT-3" - ] - }, - { - "name": "RLT-2", - "description": "'Radio Link Terminal 2'", - "type": "iana-if-type:microwaveRadioLinkTerminal", - "ietf-microwave-radio-link:mode": - "ietf-microwave-types:one-plus-one", - "ietf-microwave-radio-link:carrier-terminations": [ - "CT-2", - "CT-4" - ] - }, - { - "name": "CT-1", - "description": "'Carrier Termination 1'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10728000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - }, - { - "name": "CT-3", - "description": "'Carrier Termination 3'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10728000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - }, - { - "name": "CT-2", - "description": "'Carrier Termination 2'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10615000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - }, - { - "name": "CT-4", - "description": "'Carrier Termination 4'", - "type": "iana-if-type:microwaveCarrierTermination", - "ietf-microwave-radio-link:tx-frequency": 10615000, - "ietf-microwave-radio-link:duplex-distance": 644000, - "ietf-microwave-radio-link:channel-separation": 28000, - "ietf-microwave-radio-link:rtpc": { - "maximum-nominal-power": "20.0" - }, - "ietf-microwave-radio-link:adaptive": { - "selected-min-acm": "ietf-microwave-types:qam-256", - "selected-max-acm": "ietf-microwave-types:qam-512" - } - } - - ] } } - Note that the examples above show one particular link (unidirectional) and not a complete network topology. + This example provides a json snippet that shows geolocation + information. + + "node": [ + { + "node-id": "mw-N1", + + ... + + "ietf-te-topology:te" : { + "ietf-te-topology:geolocation": { + "altitude": "200000", + "latitude": "45", + "longitude": "90" + } + }, + "ietf-network-topology:termination-point": [ + + ... + Authors' Addresses Jonas Ahlberg