From 0ba14029ec13e4757cf05144c0f65d0fef747e39 Mon Sep 17 00:00:00 2001 From: Nikita Agarwal Date: Tue, 20 Feb 2024 15:41:56 -0800 Subject: [PATCH] Addressing review comments. Removed family attribute from OC Yang. --- models/yang/openconfig-if-ip.yang | 8 -------- translib/transformer/xfmr_intf.go | 31 +++---------------------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/models/yang/openconfig-if-ip.yang b/models/yang/openconfig-if-ip.yang index 47debfa62..8680d2dc8 100644 --- a/models/yang/openconfig-if-ip.yang +++ b/models/yang/openconfig-if-ip.yang @@ -391,10 +391,6 @@ module openconfig-if-ip { "The length of the subnet prefix."; } - leaf family { - type string; - description "Indicates whether the IP address is IPv4 or IPv6"; - } } grouping ipv4-neighbor-config { @@ -507,10 +503,6 @@ module openconfig-if-ip { description "The length of the subnet prefix."; } - leaf family { - type string; - description "Indicates whether the IP address is IPv4 or IPv6"; - } } grouping ipv6-address-state { diff --git a/translib/transformer/xfmr_intf.go b/translib/transformer/xfmr_intf.go index 3e7f94eb6..192d739c7 100644 --- a/translib/transformer/xfmr_intf.go +++ b/translib/transformer/xfmr_intf.go @@ -1375,12 +1375,9 @@ func convertIpMapToOC(intfIpMap map[string]db.Value, ifInfo *ocbinds.OpenconfigI v4Address.Ip = ipStr prfxLen := new(uint8) *prfxLen = ipNetB.Bits() - ipv4Str := new(string) - *ipv4Str = "ipv4" if isState { v4Address.State.Ip = ipStr v4Address.State.PrefixLength = prfxLen - v4Address.State.Family = ipv4Str } else { v4Address.Config.Ip = ipStr v4Address.Config.PrefixLength = prfxLen @@ -1393,12 +1390,9 @@ func convertIpMapToOC(intfIpMap map[string]db.Value, ifInfo *ocbinds.OpenconfigI v6Address.Ip = ipStr prfxLen := new(uint8) *prfxLen = ipNetB.Bits() - ipv6Str := new(string) - *ipv6Str = "ipv6" if isState { v6Address.State.Ip = ipStr v6Address.State.PrefixLength = prfxLen - v6Address.State.Family = ipv6Str } else { v6Address.Config.Ip = ipStr v6Address.Config.PrefixLength = prfxLen @@ -1597,17 +1591,6 @@ var YangToDb_intf_ip_addr_xfmr SubTreeXfmrYangToDb = func(inParams XfmrParams) ( return subIntfmap, err } log.Info("prefix:=", *addr.Config.PrefixLength) - if addr.Config.Family == nil { - addr.Config.Family = new(string) - *addr.Config.Family = "ipv4" - - } else if *addr.Config.Family == "ipv6" { - log.Error("Incorrect family ipv6!") - errStr := "IPv4 Family not present" - err = tlerr.InvalidArgsError{Format: errStr} - return subIntfmap, err - } - log.Info("family:=", *addr.Config.Family) ipPref := *addr.Config.Ip + "/" + strconv.Itoa(int(*addr.Config.PrefixLength)) /* Check for IP overlap */ @@ -1632,6 +1615,7 @@ var YangToDb_intf_ip_addr_xfmr SubTreeXfmrYangToDb = func(inParams XfmrParams) ( } intf_key := intf_intf_tbl_key_gen(ifName, *addr.Config.Ip, int(*addr.Config.PrefixLength), "|") + m["family"] = "IPv4" value := db.Value{Field: m} if _, ok := subIntfmap[tblName]; !ok { @@ -1660,17 +1644,6 @@ var YangToDb_intf_ip_addr_xfmr SubTreeXfmrYangToDb = func(inParams XfmrParams) ( return subIntfmap, err } log.Info("Ipv6 prefix:=", *addr.Config.PrefixLength) - if addr.Config.Family == nil { - addr.Config.Family = new(string) - *addr.Config.Family = "ipv6" - - } else if *addr.Config.Family == "ipv4" { - log.Error("Incorrect family!") - errStr := "IPv6 Family not present" - err = tlerr.InvalidArgsError{Format: errStr} - return subIntfmap, err - } - log.Info("family:=", *addr.Config.Family) /* Check for IPv6 overlap */ ipPref := *addr.Config.Ip + "/" + strconv.Itoa(int(*addr.Config.PrefixLength)) @@ -1680,6 +1653,8 @@ var YangToDb_intf_ip_addr_xfmr SubTreeXfmrYangToDb = func(inParams XfmrParams) ( intf_key := intf_intf_tbl_key_gen(ifName, *addr.Config.Ip, int(*addr.Config.PrefixLength), "|") + m["family"] = "IPv6" + value := db.Value{Field: m} if _, ok := subIntfmap[tblName]; !ok { subIntfmap[tblName] = make(map[string]db.Value)