Skip to content

Addressing review comments. Removed family attribute from OC Yang. #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nagarwal03 merged 1 commit into from
Feb 21, 2024
Merged

Addressing review comments. Removed family attribute from OC Yang. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions models/yang/openconfig-if-ip.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
31 changes: 3 additions & 28 deletions translib/transformer/xfmr_intf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 */
Expand All @@ -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 {
Expand Down Expand Up @@ -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))
Expand All @@ -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)
Expand Down