Skip to content

Commit

Permalink
adding network_view to the list of returned fields for network object
Browse files Browse the repository at this point in the history
  • Loading branch information
skudriavtsev committed Oct 14, 2022
1 parent 88a5ba6 commit df620cb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions object_manager_network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ var _ = Describe("Object Manager: network", func() {

getObjIn := &Network{}
getObjIn.objectType = "network"
getObjIn.returnFields = []string{"extattrs", "network", "comment"}
getObjIn.returnFields = []string{"extattrs", "network", "network_view", "comment"}

comment := "test comment 1"
updateObjIn := NewNetwork(netviewName, cidr, false, comment, expectedEas)
Expand Down Expand Up @@ -395,7 +395,7 @@ var _ = Describe("Object Manager: network", func() {

getObjIn := &Network{}
getObjIn.objectType = "network"
getObjIn.returnFields = []string{"extattrs", "network", "comment"}
getObjIn.returnFields = []string{"extattrs", "network", "network_view", "comment"}

comment := "test comment 1"
updateObjIn := NewNetwork(netviewName, cidr, false, comment, expectedEas)
Expand Down Expand Up @@ -431,7 +431,7 @@ var _ = Describe("Object Manager: network", func() {

getObjIn := &Network{}
getObjIn.objectType = "network"
getObjIn.returnFields = []string{"extattrs", "network", "comment"}
getObjIn.returnFields = []string{"extattrs", "network", "network_view", "comment"}

comment := "test comment 1"

Expand All @@ -457,7 +457,7 @@ var _ = Describe("Object Manager: network", func() {

getObjIn := &Network{}
getObjIn.objectType = "network"
getObjIn.returnFields = []string{"extattrs", "network", "comment"}
getObjIn.returnFields = []string{"extattrs", "network", "network_view", "comment"}

comment := "test comment 1"
updateObjIn := NewNetwork(netviewName, cidr, false, comment, nil)
Expand Down Expand Up @@ -489,7 +489,7 @@ var _ = Describe("Object Manager: network", func() {

getObjIn := &Network{}
getObjIn.objectType = "network"
getObjIn.returnFields = []string{"extattrs", "network", "comment"}
getObjIn.returnFields = []string{"extattrs", "network", "network_view", "comment"}

comment := ""
updateObjIn := NewNetwork(netviewName, cidr, false, comment, nil)
Expand Down Expand Up @@ -538,7 +538,7 @@ var _ = Describe("Object Manager: network", func() {

getObjIn := &Network{}
getObjIn.objectType = "network"
getObjIn.returnFields = []string{"extattrs", "network", "comment"}
getObjIn.returnFields = []string{"extattrs", "network", "network_view", "comment"}

comment := "test comment 1"
updateObjIn := NewNetwork(netviewName, cidr, false, comment, expectedEas)
Expand Down Expand Up @@ -587,7 +587,7 @@ var _ = Describe("Object Manager: network", func() {

getObjIn := &Network{}
getObjIn.objectType = "ipv6network"
getObjIn.returnFields = []string{"extattrs", "network", "comment"}
getObjIn.returnFields = []string{"extattrs", "network", "network_view", "comment"}

comment := "test comment 1"
updateObjIn := NewNetwork(netviewName, cidr, true, comment, expectedEas)
Expand Down Expand Up @@ -674,7 +674,7 @@ var _ = Describe("Object Manager: network", func() {

expectedNetwork := Network{Ref: networkRef, NetviewName: netviewName, Cidr: cidr}
expectedNetwork.objectType = "network"
expectedNetwork.returnFields = []string{"extattrs", "network", "comment"}
expectedNetwork.returnFields = []string{"extattrs", "network", "network_view", "comment"}
resObj, err := BuildNetworkFromRef(networkRef)
resObj1, err1 := BuildNetworkFromRef("network/ZG5zLm5ldHdvcmtfdmlldyQyMw")
It("should return expected Network Object", func() {
Expand All @@ -695,7 +695,7 @@ var _ = Describe("Object Manager: network", func() {

expectedNetwork := Network{Ref: networkRef, NetviewName: netviewName, Cidr: cidr}
expectedNetwork.objectType = "ipv6network"
expectedNetwork.returnFields = []string{"extattrs", "network", "comment"}
expectedNetwork.returnFields = []string{"extattrs", "network", "network_view", "comment"}
resObj, err := BuildIPv6NetworkFromRef(networkRef)
resObj1, err1 := BuildIPv6NetworkFromRef("ipv6network/ZG5zLm5ldHdvcmtfdmlldyQyMw")
It("should return expected Network Object", func() {
Expand Down
2 changes: 1 addition & 1 deletion objects.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func NewNetwork(netview string, cidr string, isIPv6 bool, comment string, ea EA)
} else {
res.objectType = "network"
}
res.returnFields = []string{"extattrs", "network", "comment"}
res.returnFields = []string{"extattrs", "network", "network_view", "comment"}

return &res
}
Expand Down
4 changes: 2 additions & 2 deletions objects_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ var _ = Describe("Objects", func() {

It("should set base fields correctly", func() {
Expect(nw.ObjectType()).To(Equal("network"))
Expect(nw.ReturnFields()).To(ConsistOf("extattrs", "network", "comment"))
Expect(nw.ReturnFields()).To(ConsistOf("extattrs", "network", "network_view", "comment"))
Expect(nw.EaSearch()).To(Equal(searchEAs))
})
})
Expand All @@ -236,7 +236,7 @@ var _ = Describe("Objects", func() {

It("should set base fields correctly", func() {
Expect(nw.ObjectType()).To(Equal("ipv6network"))
Expect(nw.ReturnFields()).To(ConsistOf("extattrs", "network", "comment"))
Expect(nw.ReturnFields()).To(ConsistOf("extattrs", "network", "network_view", "comment"))
Expect(nw.EaSearch()).To(Equal(searchEAs))
})
})
Expand Down

0 comments on commit df620cb

Please sign in to comment.