Reorganize ncm packages to align with architecture

Reorginize the ncm packges to delineate
- cluster provider and cluster management
- virtual and provider netowrk intent management
- intent scheduler
- internal ovn4k8s network controller

Overall, no code changes, just moving things around.

Issue-ID: MULTICLOUD-1029
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: I3d43c7e4eb6f285b51c0385ba18626d3511a14f5

2 files changed, 176 insertions, 0 deletions

diff --git a/src/ncm/internal/grpc/rsyncclient.go b/src/ncm/internal/grpc/rsyncclient.go
new file mode 100644
index 00000000..5eb870a7
--- /dev/null
+++ b/src/ncm/internal/grpc/rsyncclient.go
@@ -0,0 +1,41 @@
+/*
+Copyright 2020 Intel Corporation.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package grpc
+
+import (
+	log "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/logutils"
+	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/rpc"
+	controller "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module/controller"
+)
+
+const RsyncName = "rsync"
+
+// InitRsyncClient initializes connctions to the Resource Synchronizer serivice
+func InitRsyncClient() bool {
+	client := controller.NewControllerClient()
+
+	vals, _ := client.GetControllers()
+	found := false
+	for _, v := range vals {
+		if v.Metadata.Name == RsyncName {
+			log.Info("Initializing RPC connection to resource synchronizer", log.Fields{
+				"Controller": v.Metadata.Name,
+			})
+			rpc.UpdateRpcConn(v.Metadata.Name, v.Spec.Host, v.Spec.Port)
+			found = true
+			break
+		}
+	}
+	return found
+}
diff --git a/src/ncm/internal/ovncontroller/ovncontroller.go b/src/ncm/internal/ovncontroller/ovncontroller.go
new file mode 100644
index 00000000..125ad6c7
--- /dev/null
+++ b/src/ncm/internal/ovncontroller/ovncontroller.go
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2020 Intel Corporation, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ovncontroller
+
+import (
+	"encoding/json"
+
+	netintents "github.com/onap/multicloud-k8s/src/ncm/pkg/networkintents"
+	nettypes "github.com/onap/multicloud-k8s/src/ncm/pkg/networkintents/types"
+	appcontext "github.com/onap/multicloud-k8s/src/orchestrator/pkg/appcontext"
+	log "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/logutils"
+	"gopkg.in/yaml.v2"
+
+	pkgerrors "github.com/pkg/errors"
+)
+
+// controller takes an appcontext as input
+//   finds the cluster(s) associated with the context
+//   queries the network intents and adds resources to the context
+func Apply(ctxVal interface{}, clusterProvider, cluster string) error {
+	type resource struct {
+		name  string
+		value string
+	}
+	var resources []resource
+
+	var ac appcontext.AppContext
+	_, err := ac.LoadAppContext(ctxVal)
+	if err != nil {
+		return pkgerrors.Wrapf(err, "Error getting AppContext with Id: %v for %v/%v", ctxVal, clusterProvider, cluster)
+	}
+
+	// Find all Network Intents for this cluster
+	networkIntents, err := netintents.NewNetworkClient().GetNetworks(clusterProvider, cluster)
+	if err != nil {
+		return pkgerrors.Wrap(err, "Error finding Network Intents")
+	}
+	for _, intent := range networkIntents {
+		var crNetwork = netintents.CrNetwork{
+			ApiVersion: netintents.NETWORK_APIVERSION,
+			Kind:       netintents.NETWORK_KIND,
+		}
+		crNetwork.Network = intent
+		// Produce the yaml CR document for each intent
+		y, err := yaml.Marshal(&crNetwork)
+		if err != nil {
+			log.Info("Error marshalling network intent to yaml", log.Fields{
+				"error":  err,
+				"intent": intent,
+			})
+			continue
+		}
+		resources = append(resources, resource{
+			name:  intent.Metadata.Name + nettypes.SEPARATOR + netintents.NETWORK_KIND,
+			value: string(y),
+		})
+	}
+
+	// Find all Provider Network Intents for this cluster
+	providerNetworkIntents, err := netintents.NewProviderNetClient().GetProviderNets(clusterProvider, cluster)
+	if err != nil {
+		return pkgerrors.Wrap(err, "Error finding Provider Network Intents")
+	}
+	for _, intent := range providerNetworkIntents {
+		var crProviderNet = netintents.CrProviderNet{
+			ApiVersion: netintents.PROVIDER_NETWORK_APIVERSION,
+			Kind:       netintents.PROVIDER_NETWORK_KIND,
+		}
+		crProviderNet.ProviderNet = intent
+		// Produce the yaml CR document for each intent
+		y, err := yaml.Marshal(&crProviderNet)
+		if err != nil {
+			log.Info("Error marshalling provider network intent to yaml", log.Fields{
+				"error":  err,
+				"intent": intent,
+			})
+			continue
+		}
+		resources = append(resources, resource{
+			name:  intent.Metadata.Name + nettypes.SEPARATOR + netintents.PROVIDER_NETWORK_KIND,
+			value: string(y),
+		})
+	}
+
+	if len(resources) == 0 {
+		return nil
+	}
+
+	clusterhandle, _ := ac.GetClusterHandle(nettypes.CONTEXT_CLUSTER_APP, clusterProvider+nettypes.SEPARATOR+cluster)
+
+	var orderinstr struct {
+		Resorder []string `json:"resorder"`
+	}
+	var depinstr struct {
+		Resdep map[string]string `json:"resdependency"`
+	}
+	resdep := make(map[string]string)
+	for _, resource := range resources {
+		orderinstr.Resorder = append(orderinstr.Resorder, resource.name)
+		resdep[resource.name] = "go"
+		_, err = ac.AddResource(clusterhandle, resource.name, resource.value)
+		if err != nil {
+			cleanuperr := ac.DeleteCompositeApp()
+			if cleanuperr != nil {
+				log.Warn("Error cleaning AppContext after add resource failure", log.Fields{
+					"cluster-provider": clusterProvider,
+					"cluster":          cluster,
+					"resource":         resource.name,
+				})
+			}
+			return pkgerrors.Wrap(err, "Error adding Resource to AppContext")
+		}
+	}
+	jresord, _ := json.Marshal(orderinstr)
+	depinstr.Resdep = resdep
+	jresdep, _ := json.Marshal(depinstr)
+	_, err = ac.AddInstruction(clusterhandle, "resource", "order", string(jresord))
+	_, err = ac.AddInstruction(clusterhandle, "resource", "dependency", string(jresdep))
+
+	return nil
+}