From b850f07e5abce7545243eeb674495b6960d6d105 Mon Sep 17 00:00:00 2001
From: earrage <eddie.arrage@huawei.com>
Date: Thu, 11 Oct 2018 14:11:31 -0700
Subject: Add nginx services control functionality

- Modify nginx server template to use clover-controller
in clover-system namespace for file upload
- Add ability to set nginx server paths and move uploaded files
in clover-controller and set/get file upload metadata
- Add cloverctl commands to set nginx server and lb configurations
- Add example yaml files to configure nginx server and
lb v1/v2 from cloverctl
- Modify service definition for http-lb versions to distinguish
the two versions for GRPC messaging from clover-controller in SDC
deployment yaml

Change-Id: I5c6866c5ff3de358939c58ea8c0bde64a69c6eca
Signed-off-by: earrage <eddie.arrage@huawei.com>
---
 clover/cloverctl/src/cloverctl/cmd/set_nginx.go | 76 +++++++++++++++++++++++++
 clover/cloverctl/src/cloverctl/yaml/lbv1.yaml   |  9 +++
 clover/cloverctl/src/cloverctl/yaml/lbv2.yaml   |  8 +++
 clover/cloverctl/src/cloverctl/yaml/server.yaml | 16 ++++++
 4 files changed, 109 insertions(+)
 create mode 100644 clover/cloverctl/src/cloverctl/cmd/set_nginx.go
 create mode 100644 clover/cloverctl/src/cloverctl/yaml/lbv1.yaml
 create mode 100644 clover/cloverctl/src/cloverctl/yaml/lbv2.yaml
 create mode 100644 clover/cloverctl/src/cloverctl/yaml/server.yaml

(limited to 'clover/cloverctl')

diff --git a/clover/cloverctl/src/cloverctl/cmd/set_nginx.go b/clover/cloverctl/src/cloverctl/cmd/set_nginx.go
new file mode 100644
index 0000000..e7e65c2
--- /dev/null
+++ b/clover/cloverctl/src/cloverctl/cmd/set_nginx.go
@@ -0,0 +1,76 @@
+// Copyright (c) Authors of Clover
+//
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Apache License, Version 2.0
+// which accompanies this distribution, and is available at
+// http://www.apache.org/licenses/LICENSE-2.0
+
+package cmd
+
+import (
+    "fmt"
+    "io/ioutil"
+    "gopkg.in/resty.v1"
+    "github.com/spf13/cobra"
+    "github.com/ghodss/yaml"
+)
+
+
+var setserverCmd = &cobra.Command{
+    Use:   "server",
+    Short: "Modify nginx server configuration",
+    Long: ``,
+    Run: func(cmd *cobra.Command, args []string) {
+        setNginx("server")
+    },
+}
+
+var setlbCmd = &cobra.Command{
+    Use:   "lb",
+    Short: "Modify nginx lb configuration",
+    Long: ``,
+    Run: func(cmd *cobra.Command, args []string) {
+        setNginx("lb")
+    },
+}
+
+func init() {
+    setCmd.AddCommand(setserverCmd)
+    setserverCmd.Flags().StringVarP(&cloverFile, "file", "f", "", "Input yaml file for server config")
+    setserverCmd.MarkFlagRequired("file")
+
+    setCmd.AddCommand(setlbCmd)
+    setlbCmd.Flags().StringVarP(&cloverFile, "file", "f", "", "Input yaml file for lb config")
+    setlbCmd.MarkFlagRequired("file")
+
+}
+
+func setNginx(nginx_service string) {
+
+    url := ""
+    if nginx_service == "server" {
+        url = controllerIP + "/nginx/server"
+    } else {
+        url = controllerIP + "/nginx/lb"
+    }
+
+    in, err := ioutil.ReadFile(cloverFile)
+    if err != nil {
+        fmt.Println("Please specify a valid yaml file")
+        return
+    }
+    out_json, err := yaml.YAMLToJSON(in)
+    if err != nil {
+        panic(err.Error())
+    }
+    resp, err := resty.R().
+    SetHeader("Content-Type", "application/json").
+    SetBody(out_json).
+    Post(url)
+    if err != nil {
+        panic(err.Error())
+    }
+    fmt.Printf("\n%v\n", resp)
+
+
+}
diff --git a/clover/cloverctl/src/cloverctl/yaml/lbv1.yaml b/clover/cloverctl/src/cloverctl/yaml/lbv1.yaml
new file mode 100644
index 0000000..3bb841d
--- /dev/null
+++ b/clover/cloverctl/src/cloverctl/yaml/lbv1.yaml
@@ -0,0 +1,9 @@
+server_port: "9180"
+server_name: "http-lb-v1"
+lb_name: "http-lb-v1.default"
+lb_group: "cloverlb"
+lb_path: "/"
+lb_list:
+    - url: "clover-server1:9180"
+    - url: "clover-server2:9180"
+    - url: "clover-server3:9180"
diff --git a/clover/cloverctl/src/cloverctl/yaml/lbv2.yaml b/clover/cloverctl/src/cloverctl/yaml/lbv2.yaml
new file mode 100644
index 0000000..7df9376
--- /dev/null
+++ b/clover/cloverctl/src/cloverctl/yaml/lbv2.yaml
@@ -0,0 +1,8 @@
+server_port: "9180"
+server_name: "http-lb-v2"
+lb_name: "http-lb-v2.default"
+lb_group: "cloverlb"
+lb_path: "/"
+lb_list:
+    - url: "clover-server4:9180"
+    - url: "clover-server5:9180"
diff --git a/clover/cloverctl/src/cloverctl/yaml/server.yaml b/clover/cloverctl/src/cloverctl/yaml/server.yaml
new file mode 100644
index 0000000..b44779a
--- /dev/null
+++ b/clover/cloverctl/src/cloverctl/yaml/server.yaml
@@ -0,0 +1,16 @@
+server_port: "9180"
+server_name: "clover-server1"
+site_root: "/var/www/html"
+site_index: index.html
+upload_path_config: "/upload"
+upload_path_test: "/upload_test"
+locations:
+    - uri_match: "/clover/testurl"
+      directive: "try_files $uri @default2"
+      path: "/clover/testurl"
+    - uri_match: "/test"
+      directive: "try_files $uri @default1"
+      path: "/test"
+files:
+    - src_file: "/var/www/html/upload/0000000001"
+      dest_file: "var/www/html/clover/testurl/file1.png"
-- 
cgit 1.2.3-korg