Merged Origin repo

.gitlab-ci.yml

@@ -68,4 +68,4 @@ service_run:
     - echo "Finished"
   only:
     - master
-    - feature/dev
+    - feature/dev

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "hcloud-badge"]
-  path = hcloud-badge
-  url = ssh://[email protected]:8102/iitp-sds/hcloud-badge.git
-

README.md

@@ -1,2 +1,2 @@
-# hcc-violin_scheduler
-Hcloud Classic Server Deploy Scheduler
+# hcc-violin_scheduler
+Hcloud Classic Server Deploy Scheduler

driver/selectorDriver.go

@@ -1,62 +1,62 @@
-package driver
-
-import (
-	"fmt"
-	"hcc/violin-scheduler/data"
-	"hcc/violin-scheduler/lib/logger"
-	"hcc/violin-scheduler/lib/scheduler"
-	"hcc/violin-scheduler/model"
-	"time"
-)
-
-// ScheduleNodes : Scheduling nodes
-func ScheduleNodes(args map[string]interface{}) (interface{}, error) {
-	listNodeData, err := AllNodes()
-	nodes := listNodeData.(data.ListNodeData).Data.ListNode
-	var userQuota model.Quota
-	userQuota.ServerUUID = args["server_uuid"].(string)
-	userQuota.CPU = args["cpu"].(int)
-	userQuota.Memory = args["memory"].(int)
-	userQuota.NumberOfNodes = args["nr_node"].(int)
-
-	if err != nil {
-		logger.Logger.Print(err)
-		return nil, err
-	}
-	var testlist model.ScheduledNodes
-	startTime := time.Now()
-	selectedNodeList, err := scheduler.NodeListParser(nodes, userQuota)
-	for _, selectedNodeUUID := range selectedNodeList {
-		testlist.NodeList = append(testlist.NodeList, selectedNodeUUID)
-	}
-	var returnData data.ScheduledNodeData
-	returnData.Data.ScheduledNode = testlist
-	elapsedTime := time.Since((startTime))
-	logger.Logger.Println("[Create Server Scheduling Action]\nServer UUID : ", args["server_uuid"], "  Scheduling Elapse Time : ", elapsedTime)
-	return returnData.Data.ScheduledNode, err
-}
-
-func TestSchedule(args map[string]interface{}) (interface{}, error) {
-	listNodeData, err := AllNodes()
-	nodes := listNodeData.(data.ListNodeData).Data.ListNode
-	var userQuota model.Quota
-	userQuota.ServerUUID = args["server_uuid"].(string)
-	userQuota.CPU = args["cpu"].(int)
-	userQuota.Memory = args["memory"].(int)
-	userQuota.NumberOfNodes = args["nr_node"].(int)
-
-	if err != nil {
-		logger.Logger.Print(err)
-		return nil, err
-	}
-	var testlist model.ScheduledNodes
-	startTime := time.Now()
-	selectedNodeList, err := scheduler.NodeListParser(nodes, userQuota)
-	for _, selectedNodeUUID := range selectedNodeList {
-		testlist.NodeList = append(testlist.NodeList, selectedNodeUUID)
-		fmt.Println("nodelist.NodeList: ", testlist.NodeList)
-	}
-	elapsedTime := time.Since((startTime))
-	logger.Logger.Println("[Create Server Scheduling Action]\nServer UUID : ", args["server_uuid"], "  Scheduling Elapse Time : ", elapsedTime)
-	return testlist.NodeList, err
-}
+package driver
+
+import (
+	"fmt"
+	"hcc/violin-scheduler/data"
+	"hcc/violin-scheduler/lib/logger"
+	"hcc/violin-scheduler/lib/scheduler"
+	"hcc/violin-scheduler/model"
+	"time"
+)
+
+// ScheduleNodes : Scheduling nodes
+func ScheduleNodes(args map[string]interface{}) (interface{}, error) {
+	listNodeData, err := AllNodes()
+	nodes := listNodeData.(data.ListNodeData).Data.ListNode
+	var userQuota model.Quota
+	userQuota.ServerUUID = args["server_uuid"].(string)
+	userQuota.CPU = args["cpu"].(int)
+	userQuota.Memory = args["memory"].(int)
+	userQuota.NumberOfNodes = args["nr_node"].(int)
+
+	if err != nil {
+		logger.Logger.Print(err)
+		return nil, err
+	}
+	var testlist model.ScheduledNodes
+	startTime := time.Now()
+	selectedNodeList, err := scheduler.NodeListParser(nodes, userQuota)
+	for _, selectedNodeUUID := range selectedNodeList {
+		testlist.NodeList = append(testlist.NodeList, selectedNodeUUID)
+	}
+	var returnData data.ScheduledNodeData
+	returnData.Data.ScheduledNode = testlist
+	elapsedTime := time.Since((startTime))
+	logger.Logger.Println("[Create Server Scheduling Action]\nServer UUID : ", args["server_uuid"], "  Scheduling Elapse Time : ", elapsedTime)
+	return returnData.Data.ScheduledNode, err
+}
+
+func TestSchedule(args map[string]interface{}) (interface{}, error) {
+	listNodeData, err := AllNodes()
+	nodes := listNodeData.(data.ListNodeData).Data.ListNode
+	var userQuota model.Quota
+	userQuota.ServerUUID = args["server_uuid"].(string)
+	userQuota.CPU = args["cpu"].(int)
+	userQuota.Memory = args["memory"].(int)
+	userQuota.NumberOfNodes = args["nr_node"].(int)
+
+	if err != nil {
+		logger.Logger.Print(err)
+		return nil, err
+	}
+	var testlist model.ScheduledNodes
+	startTime := time.Now()
+	selectedNodeList, err := scheduler.NodeListParser(nodes, userQuota)
+	for _, selectedNodeUUID := range selectedNodeList {
+		testlist.NodeList = append(testlist.NodeList, selectedNodeUUID)
+		fmt.Println("nodelist.NodeList: ", testlist.NodeList)
+	}
+	elapsedTime := time.Since((startTime))
+	logger.Logger.Println("[Create Server Scheduling Action]\nServer UUID : ", args["server_uuid"], "  Scheduling Elapse Time : ", elapsedTime)
+	return testlist.NodeList, err
+}

end/mainEnd.go

@@ -1,7 +1,7 @@
-package end
-
-// MainEnd : Main ending function
-func MainEnd() {
-	// mysqlEnd()
-	loggerEnd()
-}
+package end
+
+// MainEnd : Main ending function
+func MainEnd() {
+	// mysqlEnd()
+	loggerEnd()
+}

http/queryURLEncoder.go

@@ -1,23 +1,23 @@
-package http
-
-import (
-	"net/url"
-	"strings"
-)
-
-func compatibleRFC3986Encode(str string) string {
-	resultStr := str
-	resultStr = strings.Replace(resultStr, "+", "%20", -1)
-	return resultStr
-}
-
-func queryURLEncoder(queryString string) string {
-	params := url.Values{
-		"query_string": {queryString},
-	}
-
-	urlEncode := compatibleRFC3986Encode(params.Encode())
-	urlEncode = urlEncode[len("query_string="):]
-
-	return urlEncode
-}
+package http
+
+import (
+	"net/url"
+	"strings"
+)
+
+func compatibleRFC3986Encode(str string) string {
+	resultStr := str
+	resultStr = strings.Replace(resultStr, "+", "%20", -1)
+	return resultStr
+}
+
+func queryURLEncoder(queryString string) string {
+	params := url.Values{
+		"query_string": {queryString},
+	}
+
+	urlEncode := compatibleRFC3986Encode(params.Encode())
+	urlEncode = urlEncode[len("query_string="):]
+
+	return urlEncode
+}

init/mainInit.go

@@ -7,7 +7,6 @@ import (
 
 // MainInit : Main initialization function
 func MainInit() error {
-
 	err := loggerInit()
 	if err != nil {
 		return err

lib/config/configParser.go

@@ -6,9 +6,11 @@ import (
 	"github.com/Terry-Mao/goconf"
 )
 
-var conf = goconf.New()
-var config = schedulerConfig{}
-var err error
+var (
+	conf   = goconf.New()
+	config = schedulerConfig{}
+	err    error
+)
 
 func parseMysql() {
 	config.MysqlConfig = conf.Get("mysql")
@@ -43,7 +45,7 @@ func parseMysql() {
 	}
 }
 
-//Will be Deprecated
+// Will be Deprecated
 func parseHTTP() {
 	config.HTTPConfig = conf.Get("http")
 	if config.HTTPConfig == nil {

lib/config/violinSchedulerConfig.go

@@ -1,13 +1,13 @@
-package config
-
-import "github.com/Terry-Mao/goconf"
-
-var configLocation = "/etc/hcc/violin-scheduler/violin-scheduler.conf"
-
-type schedulerConfig struct {
-	MysqlConfig    *goconf.Section
-	HTTPConfig     *goconf.Section
-	RabbitMQConfig *goconf.Section
-	FluteConfig    *goconf.Section
-	GrpcConfig     *goconf.Section
-}
+package config
+
+import "github.com/Terry-Mao/goconf"
+
+var configLocation = "/etc/hcc/violin-scheduler/violin-scheduler.conf"
+
+type schedulerConfig struct {
+	MysqlConfig    *goconf.Section
+	HTTPConfig     *goconf.Section
+	RabbitMQConfig *goconf.Section
+	FluteConfig    *goconf.Section
+	GrpcConfig     *goconf.Section
+}