diff --git a/openr/common/LsdbUtil.cpp b/openr/common/LsdbUtil.cpp index a306729eae1..494c20cf492 100644 --- a/openr/common/LsdbUtil.cpp +++ b/openr/common/LsdbUtil.cpp @@ -521,9 +521,6 @@ createPrefixEntry( thrift::PrefixEntry prefixEntry; prefixEntry.prefix() = prefix; prefixEntry.type() = type; - if (not data.empty()) { - prefixEntry.data() = data; - } prefixEntry.forwardingType() = forwardingType; prefixEntry.forwardingAlgorithm() = forwardingAlgorithm; prefixEntry.minNexthop().from_optional(minNexthop); diff --git a/openr/if/Types.thrift b/openr/if/Types.thrift index 8b8e34e16cc..23ce0af98a4 100644 --- a/openr/if/Types.thrift +++ b/openr/if/Types.thrift @@ -302,12 +302,6 @@ struct PrefixEntry { */ 2: Network.PrefixType type (deprecated); - /** - * TODO: remove later when openr -> bgp route redistribution is gone - * Optional additional metadata. Encoding depends on PrefixType - */ - 3: optional binary data (deprecated); - /** * Default mode of forwarding for prefix is IP. If `forwardingType` is * set to SR_MPLS, then packet will be encapsulated via IP -> MPLS route will @@ -315,6 +309,7 @@ struct PrefixEntry { * while preserving the label until packet reaches destination */ 4: OpenrConfig.PrefixForwardingType forwardingType = OpenrConfig.PrefixForwardingType.IP; + /** * Default forwarding (route computation) algorithm is shortest path ECMP. * Open/R implements 2-shortest path edge disjoint algorithm for forwarding. @@ -431,15 +426,6 @@ typedef map ( cpp.type = "std::unordered_map", ) AdjDbs -/** - * @deprecated - Map of node name to adjacency database. This is deprecated - * in favor of `received-routes` and `advertised-routes` and should go away - * once area migration is complete. - */ -typedef map ( - cpp.type = "std::unordered_map", -) PrefixDbs - /** * Represents complete route database that is or should be programmed in * underlying platform. diff --git a/openr/py/openr/cli/tests/decision/fixtures.py b/openr/py/openr/cli/tests/decision/fixtures.py index b5c2705c87b..e10294b2e6a 100644 --- a/openr/py/openr/cli/tests/decision/fixtures.py +++ b/openr/py/openr/cli/tests/decision/fixtures.py @@ -543,7 +543,6 @@ }, "route": { "area_stack": [], - "data": null, "forwardingAlgorithm": 0, "forwardingType": 0, "metrics": { @@ -586,7 +585,6 @@ }, "route": { "area_stack": [], - "data": null, "forwardingAlgorithm": 0, "forwardingType": 0, "metrics": { @@ -629,7 +627,6 @@ }, "route": { "area_stack": [], - "data": null, "forwardingAlgorithm": 0, "forwardingType": 0, "metrics": { @@ -665,7 +662,6 @@ "prefixEntries": [ { "area_stack": [], - "data": null, "forwardingAlgorithm": 0, "forwardingType": 0, "metrics": { @@ -685,7 +681,6 @@ }, { "area_stack": [], - "data": null, "forwardingAlgorithm": 0, "forwardingType": 0, "metrics": { diff --git a/openr/py/openr/cli/tests/prefixmgr/fixtures.py b/openr/py/openr/cli/tests/prefixmgr/fixtures.py index 0f0a59b2793..983e96d5923 100644 --- a/openr/py/openr/cli/tests/prefixmgr/fixtures.py +++ b/openr/py/openr/cli/tests/prefixmgr/fixtures.py @@ -37,7 +37,6 @@ prefixLength=0, ), type=PrefixType.BGP, - data=b"b''", forwardingType=PrefixForwardingType.SR_MPLS, forwardingAlgorithm=PrefixForwardingAlgorithm.SP_ECMP, minNexthop=24, @@ -69,7 +68,6 @@ prefixLength=0, ), type=PrefixType.BGP, - data=b"b''", forwardingType=PrefixForwardingType.SR_MPLS, forwardingAlgorithm=PrefixForwardingAlgorithm.SP_ECMP, minNexthop=24, @@ -149,7 +147,6 @@ "64900", "65301" ], - "data": "b''", "forwardingAlgorithm": 0, "forwardingType": 1, "metrics": { @@ -192,7 +189,6 @@ "64900", "65301" ], - "data": "b''", "forwardingAlgorithm": 0, "forwardingType": 1, "metrics": { diff --git a/openr/py/openr/cli/utils/commands.py b/openr/py/openr/cli/utils/commands.py index 250d157ba04..131c5cc2524 100644 --- a/openr/py/openr/cli/utils/commands.py +++ b/openr/py/openr/cli/utils/commands.py @@ -90,7 +90,7 @@ def iter_dbs( parse prefix/adj databases @param: container - container to store the generated data and returns - @param: dbs - decision_types.PrefixDbs or decision_types.AdjDbs + @param: dbs - decision_types.AdjDbs @param: nodes - set: the set of nodes for parsing @param: parse_func - function: the parsing function """ diff --git a/openr/py/openr/cli/utils/utils.py b/openr/py/openr/cli/utils/utils.py index 77f64f0b7a5..81bad50dd18 100644 --- a/openr/py/openr/cli/utils/utils.py +++ b/openr/py/openr/cli/utils/utils.py @@ -364,9 +364,6 @@ def _update(prefix_entry_dict, prefix_entry): prefix_entry_dict.update( { "prefix": ipnetwork.sprint_prefix(prefix_entry.prefix), - "data": str(prefix_entry.data) - if prefix_entry.data is not None - else None, "metrics": thrift_to_dict(prefix_entry.metrics), "tags": list(prefix_entry.tags if prefix_entry.tags else []), } @@ -384,9 +381,6 @@ def _update(prefix_entry_dict, prefix_entry): prefix_entry_dict.update( { "prefix": ipnetwork.sprint_prefix(prefix_entry.prefix), - "data": str(prefix_entry.data) - if prefix_entry.data is not None - else None, "metrics": thrift_py_to_dict(prefix_entry.metrics), "tags": list(prefix_entry.tags if prefix_entry.tags else []), }