From ad7782cbf83c11f152a6457f3808a4da99a1ae56 Mon Sep 17 00:00:00 2001
From: Eric Multanen <eric.w.multanen@intel.com>
Date: Thu, 28 May 2020 17:07:20 -0700
Subject: Create OVN network action controller from ncm

Split out part of ncm microservice to act as the
Onv4k8s network action controller for the orchestrator.
No code changes really - just moving around to fit the
architectural plan.

Issue-ID: MULTICLOUD-1029
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: I17292ac72d041050269f05fc4a0c2a6ca741aeb5
---
 .../contextupdateserver/contextupdateserver.go     | 45 -----------------
 src/ncm/pkg/grpc/register.go                       | 58 ----------------------
 2 files changed, 103 deletions(-)
 delete mode 100644 src/ncm/pkg/grpc/contextupdateserver/contextupdateserver.go
 delete mode 100644 src/ncm/pkg/grpc/register.go

(limited to 'src/ncm/pkg/grpc')

diff --git a/src/ncm/pkg/grpc/contextupdateserver/contextupdateserver.go b/src/ncm/pkg/grpc/contextupdateserver/contextupdateserver.go
deleted file mode 100644
index fc548ccc..00000000
--- a/src/ncm/pkg/grpc/contextupdateserver/contextupdateserver.go
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-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 contextupdateserver
-
-import (
-	"context"
-	"encoding/json"
-	"log"
-
-	contextpb "github.com/onap/multicloud-k8s/src/orchestrator/pkg/grpc/contextupdate"
-	//"google.golang.org/grpc/codes"
-	//"google.golang.org/grpc/status"
-)
-
-type contextupdateServer struct {
-	contextpb.UnimplementedContextupdateServer
-}
-
-func (cs *contextupdateServer) UpdateAppContext(ctx context.Context, req *contextpb.ContextUpdateRequest) (*contextpb.ContextUpdateResponse, error) {
-	contextUpdateReq, _ := json.Marshal(req)
-	log.Println("GRPC Server received contextupdateRequest: ", string(contextUpdateReq))
-
-	// Insert call to Server Functionality here
-	//
-	//
-
-	return &contextpb.ContextUpdateResponse{AppContextUpdated: true}, nil
-}
-
-// NewContextUpdateServer exported
-func NewContextupdateServer() *contextupdateServer {
-	s := &contextupdateServer{}
-	return s
-}
diff --git a/src/ncm/pkg/grpc/register.go b/src/ncm/pkg/grpc/register.go
deleted file mode 100644
index 07d8f5c0..00000000
--- a/src/ncm/pkg/grpc/register.go
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-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 (
-	"os"
-	"strconv"
-	"strings"
-
-	log "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/logutils"
-)
-
-const default_host = "localhost"
-const default_port = 9030
-const default_ncm_name = "ncm"
-const ENV_NCM_NAME = "NCM_NAME"
-
-func GetServerHostPort() (string, int) {
-
-	// expect name of this ncm program to be in env variable "NCM_NAME" - e.g. NCM_NAME="ncm"
-	serviceName := os.Getenv(ENV_NCM_NAME)
-	if serviceName == "" {
-		serviceName = default_ncm_name
-		log.Info("Using default name for NCM service name", log.Fields{
-			"Name": serviceName,
-		})
-	}
-
-	// expect service name to be in env variable - e.g. NCM_SERVICE_HOST
-	host := os.Getenv(strings.ToUpper(serviceName) + "_SERVICE_HOST")
-	if host == "" {
-		host = default_host
-		log.Info("Using default host for ncm gRPC controller", log.Fields{
-			"Host": host,
-		})
-	}
-
-	// expect service port to be in env variable - e.g. NCM_SERVICE_PORT
-	port, err := strconv.Atoi(os.Getenv(strings.ToUpper(serviceName) + "_SERVICE_PORT"))
-	if err != nil || port < 0 {
-		port = default_port
-		log.Info("Using default port for ncm gRPC controller", log.Fields{
-			"Port": port,
-		})
-	}
-	return host, port
-}
-- 
cgit 1.2.3-korg