aboutsummaryrefslogtreecommitdiffstats
path: root/src/ncm/cmd
diff options
context:
space:
mode:
authorEric Multanen <eric.w.multanen@intel.com>2020-05-28 17:07:20 -0700
committerEric Multanen <eric.w.multanen@intel.com>2020-06-02 14:00:07 -0700
commitad7782cbf83c11f152a6457f3808a4da99a1ae56 (patch)
treee88276d8f0d55bd58a903d1c31ab4e43e4011193 /src/ncm/cmd
parentc257a136355a794f5bf778f670c041e8958c3608 (diff)
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
Diffstat (limited to 'src/ncm/cmd')
-rw-r--r--src/ncm/cmd/main.go58
1 files changed, 0 insertions, 58 deletions
diff --git a/src/ncm/cmd/main.go b/src/ncm/cmd/main.go
index 49af81ee..640fa3ea 100644
--- a/src/ncm/cmd/main.go
+++ b/src/ncm/cmd/main.go
@@ -15,72 +15,21 @@ package main
import (
"context"
- "fmt"
"log"
"math/rand"
- "net"
"net/http"
"os"
"os/signal"
- "strings"
"time"
"github.com/gorilla/handlers"
"github.com/onap/multicloud-k8s/src/ncm/api"
- register "github.com/onap/multicloud-k8s/src/ncm/pkg/grpc"
- "github.com/onap/multicloud-k8s/src/ncm/pkg/grpc/contextupdateserver"
- updatepb "github.com/onap/multicloud-k8s/src/orchestrator/pkg/grpc/contextupdate"
"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/auth"
"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/config"
contextDb "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/contextdb"
"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/db"
- "google.golang.org/grpc"
- "google.golang.org/grpc/credentials"
- "google.golang.org/grpc/testdata"
)
-func startGrpcServer() error {
- var tls bool
-
- if strings.Contains(config.GetConfiguration().GrpcEnableTLS, "enable") {
- tls = true
- } else {
- tls = false
- }
- certFile := config.GetConfiguration().GrpcServerCert
- keyFile := config.GetConfiguration().GrpcServerKey
-
- host, port := register.GetServerHostPort()
-
- lis, err := net.Listen("tcp", fmt.Sprintf("%s:%d", host, port))
- if err != nil {
- log.Fatalf("Could not listen to port: %v", err)
- }
- var opts []grpc.ServerOption
- if tls {
- if certFile == "" {
- certFile = testdata.Path("server.pem")
- }
- if keyFile == "" {
- keyFile = testdata.Path("server.key")
- }
- creds, err := credentials.NewServerTLSFromFile(certFile, keyFile)
- if err != nil {
- log.Fatalf("Could not generate credentials %v", err)
- }
- opts = []grpc.ServerOption{grpc.Creds(creds)}
- }
- grpcServer := grpc.NewServer(opts...)
- updatepb.RegisterContextupdateServer(grpcServer, contextupdateserver.NewContextupdateServer())
-
- log.Println("Starting Network Configuration Manager gRPC Server")
- err = grpcServer.Serve(lis)
- if err != nil {
- log.Fatalf("ncm grpc server is not serving %v", err)
- }
- return err
-}
-
func main() {
rand.Seed(time.Now().UnixNano())
@@ -106,13 +55,6 @@ func main() {
Addr: ":" + config.GetConfiguration().ServicePort,
}
- go func() {
- err := startGrpcServer()
- if err != nil {
- log.Fatalf("GRPC server failed to start")
- }
- }()
-
connectionsClose := make(chan struct{})
go func() {
c := make(chan os.Signal, 1)