Merge changes I56fb4643,Ia1e9802a

* changes:
  Add etcd support in infrastructure layer
  Restructure code and create module library

1 files changed, 10 insertions, 4 deletions

diff --git a/src/orchestrator/cmd/main.go b/src/orchestrator/cmd/main.go
index 657d5bf5..f46fe910 100644
--- a/src/orchestrator/cmd/main.go
+++ b/src/orchestrator/cmd/main.go
@@ -23,10 +23,10 @@ import (
 	"time"
 
 	"github.com/onap/multicloud-k8s/src/orchestrator/api"
-	"github.com/onap/multicloud-k8s/src/orchestrator/internal/auth"
-	"github.com/onap/multicloud-k8s/src/orchestrator/internal/config"
-	"github.com/onap/multicloud-k8s/src/orchestrator/internal/db"
-
+	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/auth"
+	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/config"
+	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/db"
+	contextDb "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/contextdb"
 	"github.com/gorilla/handlers"
 )
 
@@ -40,6 +40,12 @@ func main() {
 		log.Println(err)
 		log.Fatalln("Exiting...")
 	}
+        err = contextDb.InitializeContextDatabase()
+	if err != nil {
+		log.Println("Unable to initialize database connection...")
+		log.Println(err)
+		log.Fatalln("Exiting...")
+	}
 
 	httpRouter := api.NewRouter(nil)
 	loggedRouter := handlers.LoggingHandler(os.Stdout, httpRouter)