Enable export and import of SDN configuration

resolves #269 (closed)

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

controller/northbound/server/configurationmanagement.go

@@ -117,20 +117,30 @@ func (c ConfigurationManagementServer) ImportSDNConfig(ctx context.Context, requ
 	//TODO: Clear DB
 
 	//Create all elements
+	c.createElements(&sdnConfig, request)
+	if err != nil {
+		return nil, err
+	}
+
+	return &cmpb.ImportSDNConfigResponse{
+		Timestamp: time.Now().UnixNano()}, nil
+}
+
+func (c ConfigurationManagementServer) createElements(sdnConfig *loadedSDNConfig, request *cmpb.ImportSDNConfigRequest) error {
 	pndUUID := uuid.MustParse(request.Pid)
 	pnd, err := c.pndStore.Get(store.Query{ID: pndUUID})
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, inputSBI := range sdnConfig.Sbis {
 		sbi, err := nucleus.NewSBI(inputSBI.Type, uuid.MustParse(inputSBI.ID))
 		if err != nil {
-			return nil, err
+			return err
 		}
 		err = pnd.AddSbi(sbi)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
@@ -141,7 +151,7 @@ func (c ConfigurationManagementServer) ImportSDNConfig(ctx context.Context, requ
 		}
 		_, err = c.nodeService.EnsureExists(node)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
@@ -153,26 +163,26 @@ func (c ConfigurationManagementServer) ImportSDNConfig(ctx context.Context, requ
 		}
 		_, err = c.portService.EnsureExists(port)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
 	for _, inputPort := range sdnConfig.Links {
 		sourceNode, err := c.nodeService.Get(store.Query{ID: inputPort.SourceNode.ID})
 		if err != nil {
-			return nil, err
+			return err
 		}
 		targetNode, err := c.nodeService.Get(store.Query{ID: inputPort.TargetNode.ID})
 		if err != nil {
-			return nil, err
+			return err
 		}
 		sourcePort, err := c.portService.Get(store.Query{ID: inputPort.SourcePort.ID})
 		if err != nil {
-			return nil, err
+			return err
 		}
 		targetPort, err := c.portService.Get(store.Query{ID: inputPort.TargetPort.ID})
 		if err != nil {
-			return nil, err
+			return err
 		}
 		link := links.Link{
 			ID:         inputPort.ID,
@@ -184,7 +194,7 @@ func (c ConfigurationManagementServer) ImportSDNConfig(ctx context.Context, requ
 		}
 		err = c.topologyService.AddLink(link)
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
@@ -205,21 +215,18 @@ func (c ConfigurationManagementServer) ImportSDNConfig(ctx context.Context, requ
 			uuid.MustParse(inputNetworkElement.ID),
 		)
 		if err != nil {
-			return nil, err
+			return err
 		}
 
 		networkelement, err := pnd.GetNetworkElement(inputNetworkElement.ID)
 		if err != nil {
-			return nil, err
+			return err
 		}
 
 		err = pnd.UpdateNetworkElement(networkelement, inputNetworkElement.Model)
 		if err != nil {
-			return nil, err
+			return err
 		}
-
 	}
-
-	return &cmpb.ImportSDNConfigResponse{
-		Timestamp: time.Now().UnixNano()}, nil
+	return nil
 }