a minor refinement of the code (#174)

infobloxopen · Jul 6, 2022 · 063667c · 063667c
1 parent 2e8edbf
commit 063667c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/object_manager.go b/object_manager.go
@@ -12,7 +12,7 @@ var _ IBObjectManager = new(ObjectManager)
 type IBObjectManager interface {
 	AllocateIP(netview string, cidr string, ipAddr string, isIPv6 bool, macOrDuid string, name string, comment string, eas EA) (*FixedAddress, error)
 	AllocateNetwork(netview string, cidr string, isIPv6 bool, prefixLen uint, comment string, eas EA) (network *Network, err error)
-	AllocateNetworkContainer(netview string, cidr string, isIPv6 bool, prefixLen uint, comment string, eas EA) (network *NetworkContainer, err error)
+	AllocateNetworkContainer(netview string, cidr string, isIPv6 bool, prefixLen uint, comment string, eas EA) (netContainer *NetworkContainer, err error)
 	CreateARecord(netView string, dnsView string, name string, cidr string, ipAddr string, ttl uint32, useTTL bool, comment string, ea EA) (*RecordA, error)
 	CreateAAAARecord(netView string, dnsView string, recordName string, cidr string, ipAddr string, useTtl bool, ttl uint32, comment string, eas EA) (*RecordAAAA, error)
 	CreateZoneAuth(fqdn string, ea EA) (*ZoneAuth, error)

diff --git a/object_manager_network_container.go b/object_manager_network_container.go
@@ -82,25 +82,22 @@ func (objMgr *ObjectManager) AllocateNetworkContainer(
 	isIPv6 bool,
 	prefixLen uint,
 	comment string,
-	eas EA) (networkContainer *NetworkContainer, err error) {
+	eas EA) (*NetworkContainer, error) {
 
 	containerInfo := NewNetworkContainerNextAvailableInfo(netview, cidr, prefixLen, isIPv6)
 	container := NewNetworkContainerNextAvailable(containerInfo, isIPv6, comment, eas)
 
 	ref, err := objMgr.connector.CreateObject(container)
 
-	if err == nil {
-		if isIPv6 {
-			networkContainer, err = BuildIPv6NetworkContainerFromRef(ref)
-		} else {
-			networkContainer, err = BuildNetworkContainerFromRef(ref)
-		}
-	}
 	if err != nil {
 		return nil, err
 	}
 
-	return
+	if isIPv6 {
+		return BuildIPv6NetworkContainerFromRef(ref)
+	} else {
+		return BuildNetworkContainerFromRef(ref)
+	}
 }
 
 func (objMgr *ObjectManager) DeleteNetworkContainer(ref string) (string, error) {