refactor/bgp (#181)

* refactor(bgp)

* prefix-lists

---------

Co-authored-by: rocrowe <rocrowe@cisco.com>

Author: rwcrowe

iosxr_prefix_list.tf

@@ -31,7 +31,7 @@ locals {
           permission             = try(entry.action, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.action, null)
           prefix                 = try(entry.prefix, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.prefix, null)
           zone                   = try(entry.zone, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.zone, 0)
-          mask                   = try(entry.mask, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.mask, null)
+          mask                   = try(entry.length, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.length, null)
           match_prefix_length_eq = try(entry.exact_length, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.exact_length, null)
           match_prefix_length_ge = try(entry.min_length, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.min_length, null)
           match_prefix_length_le = try(entry.max_length, local.defaults.iosxr.devices.configuration.prefix_lists.ipv6.entries.max_length, null)

iosxr_router_bgp.tf

@@ -4,11 +4,11 @@ locals {
       for bgp_process in try(local.device_config[device.name].routing.bgp, []) : [
         for af_group in try(bgp_process.af_groups, []) : [
           for af in try(af_group.address_family, []) : {
-            key                                                = format("%s/%s/%s/%s", device.name, bgp_process.as_number, af_group.group_name, af.af_name)
+            key                                                = format("%s/%s/%s/%s", device.name, bgp_process.as_number, af_group.name, af.name)
             device_name                                        = device.name
             as_number                                          = try(bgp_process.as_number, local.defaults.iosxr.devices.configuration.routing.bgp.as_number, null)
-            af_group_name                                      = try(af_group.group_name, local.defaults.iosxr.devices.configuration.routing.bgp.af_groups.group_name, null)
-            af_name                                            = try(af.af_name, local.defaults.iosxr.devices.configuration.routing.bgp.af_groups.address_family.af_name, null)
+            af_group_name                                      = try(af_group.name, local.defaults.iosxr.devices.configuration.routing.bgp.af_groups.name, null)
+            af_name                                            = try(af.name, local.defaults.iosxr.devices.configuration.routing.bgp.af_groups.address_family.name, null)
             encapsulation_type                                 = try(af.encapsulation_type, local.defaults.iosxr.devices.configuration.routing.bgp.af_groups.address_family.encapsulation_type, null)
             weight                                             = try(af.weight, local.defaults.iosxr.devices.configuration.routing.bgp.af_groups.address_family.weight, null)
             multipath                                          = try(af.multipath, local.defaults.iosxr.devices.configuration.routing.bgp.af_groups.address_family.multipath, null)

iosxr_router_bgp_address_family.tf

@@ -4,11 +4,11 @@ locals {
       for bgp_process in try(local.device_config[device.name].routing.bgp, []) : [
         for neighbor in try(bgp_process.neighbors, []) : [
           for af in try(neighbor.address_family, []) : {
-            key                                                = format("%s/%s/%s/%s", device.name, bgp_process.as_number, neighbor.ip, af.af_name)
+            key                                                = format("%s/%s/%s/%s", device.name, bgp_process.as_number, neighbor.address, af.name)
             device_name                                        = device.name
             as_number                                          = try(bgp_process.as_number, local.defaults.iosxr.devices.configuration.routing.bgp.as_number, null)
-            address                                            = try(neighbor.ip, local.defaults.iosxr.devices.configuration.routing.bgp.neighbors.ip, null)
-            af_name                                            = try(af.af_name, local.defaults.iosxr.devices.configuration.routing.bgp.neighbors.address_family.af_name, null)
+            address                                            = try(neighbor.address, local.defaults.iosxr.devices.configuration.routing.bgp.neighbors.address, null)
+            af_name                                            = try(af.name, local.defaults.iosxr.devices.configuration.routing.bgp.neighbors.address_family.name, null)
             encapsulation_type                                 = try(af.encapsulation_type, local.defaults.iosxr.devices.configuration.routing.bgp.neighbors.address_family.encapsulation_type, null)
             weight                                             = try(af.weight, local.defaults.iosxr.devices.configuration.routing.bgp.neighbors.address_family.weight, null)
             multipath                                          = try(af.multipath, local.defaults.iosxr.devices.configuration.routing.bgp.neighbors.address_family.multipath, null)