Merge pull request #567 from kaccardi/topic/move-compute

ciao-controller: move OpenStack compute support to openstack pkg
ciao-project · Sep 23, 2016 · db03203 · db03203
2 parents e2e3f06 + f2bc97c
commit db03203
Show file tree

Hide file tree

Showing 20 changed files with 2,753 additions and 2,539 deletions.
diff --git a/ciao-cli/event.go b/ciao-cli/event.go
@@ -22,7 +22,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/01org/ciao/payloads"
+	"github.com/01org/ciao/ciao-controller/types"
 )
 
 var eventCommand = &command{
@@ -68,7 +68,7 @@ func (cmd *eventListCommand) run(args []string) error {
 		cmd.usage()
 	}
 
-	var events payloads.CiaoEvents
+	var events types.CiaoEvents
 	var url string
 
 	if cmd.all == true {

diff --git a/ciao-cli/instance.go b/ciao-cli/instance.go
@@ -26,7 +26,8 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/01org/ciao/payloads"
+	"github.com/01org/ciao/ciao-controller/types"
+	"github.com/01org/ciao/openstack/compute"
 )
 
 const (
@@ -85,11 +86,11 @@ func (cmd *instanceAddCommand) run(args []string) error {
 		cmd.usage()
 	}
 
-	var server payloads.ComputeCreateServer
-	var servers payloads.ComputeServers
+	var server compute.CreateServerRequest
+	var servers compute.Servers
 
 	server.Server.Name = cmd.label
-	server.Server.Workload = cmd.workload
+	server.Server.Flavor = cmd.workload
 	server.Server.MaxInstances = cmd.instances
 	server.Server.MinInstances = 1
 
@@ -318,7 +319,7 @@ func (cmd *instanceListCommand) run(args []string) error {
 		return listNodeInstances(cmd.cn)
 	}
 
-	var servers payloads.ComputeServers
+	var servers compute.Servers
 	var url string
 
 	if cmd.workload != "" {
@@ -417,7 +418,7 @@ func (cmd *instanceShowCommand) run(args []string) error {
 		cmd.usage()
 	}
 
-	var server payloads.ComputeServer
+	var server compute.Server
 	url := buildComputeURL("%s/servers/%s", *tenantID, cmd.instance)
 
 	resp, err := sendHTTPRequest("GET", url, nil, nil)
@@ -433,7 +434,7 @@ func (cmd *instanceShowCommand) run(args []string) error {
 	return nil
 }
 
-func dumpInstance(server *payloads.Server) {
+func dumpInstance(server *compute.ServerDetails) {
 	fmt.Printf("\tUUID: %s\n", server.ID)
 	fmt.Printf("\tStatus: %s\n", server.Status)
 	fmt.Printf("\tPrivate IP: %s\n", server.Addresses.Private[0].Addr)
@@ -452,7 +453,7 @@ func listNodeInstances(node string) error {
 		fatalf("Missing required -cn parameter")
 	}
 
-	var servers payloads.CiaoServersStats
+	var servers types.CiaoServersStats
 	url := buildComputeURL("nodes/%s/servers/detail", node)
 
 	resp, err := sendHTTPRequest("GET", url, nil, nil)
@@ -480,7 +481,7 @@ func listNodeInstances(node string) error {
 }
 
 func actionAllTenantInstance(tenant string, osAction string) error {
-	var action payloads.CiaoServersAction
+	var action types.CiaoServersAction
 
 	url := buildComputeURL("%s/servers/action", tenant)
 

diff --git a/ciao-cli/node.go b/ciao-cli/node.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/01org/ciao/payloads"
+	"github.com/01org/ciao/ciao-controller/types"
 )
 
 var nodeCommand = &command{
@@ -70,7 +70,7 @@ func (cmd *nodeListCommand) run(args []string) error {
 }
 
 func listComputeNodes() error {
-	var nodes payloads.CiaoComputeNodes
+	var nodes types.CiaoComputeNodes
 
 	url := buildComputeURL("nodes")
 
@@ -100,7 +100,7 @@ func listComputeNodes() error {
 }
 
 func listCNCINodes() error {
-	var cncis payloads.CiaoCNCIs
+	var cncis types.CiaoCNCIs
 
 	url := buildComputeURL("cncis")
 
@@ -146,7 +146,7 @@ func (cmd *nodeStatusCommand) parseArgs(args []string) []string {
 }
 
 func (cmd *nodeStatusCommand) run(args []string) error {
-	var status payloads.CiaoClusterStatus
+	var status types.CiaoClusterStatus
 	url := buildComputeURL("nodes/summary")
 
 	resp, err := sendHTTPRequest("GET", url, nil, nil)
@@ -207,7 +207,7 @@ func showCNCINode(cnciID string) error {
 		fatalf("Missing required -cnci-id parameter")
 	}
 
-	var cnci payloads.CiaoCNCI
+	var cnci types.CiaoCNCI
 
 	url := buildComputeURL("cncis/%s/detail", cnciID)
 

diff --git a/ciao-cli/tenant.go b/ciao-cli/tenant.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/01org/ciao/payloads"
+	"github.com/01org/ciao/ciao-controller/types"
 )
 
 var tenantCommand = &command{
@@ -104,7 +104,7 @@ func listTenantQuotas() error {
 		fatalf("Missing required -tenant-id parameter")
 	}
 
-	var resources payloads.CiaoTenantResources
+	var resources types.CiaoTenantResources
 	url := buildComputeURL("%s/quotas", *tenantID)
 
 	resp, err := sendHTTPRequest("GET", url, nil, nil)
@@ -131,7 +131,7 @@ func listTenantResources() error {
 		fatalf("Missing required -tenant-id parameter")
 	}
 
-	var usage payloads.CiaoUsageHistory
+	var usage types.CiaoUsageHistory
 	url := buildComputeURL("%s/resources", *tenantID)
 
 	now := time.Now()

diff --git a/ciao-cli/trace.go b/ciao-cli/trace.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/01org/ciao/payloads"
+	"github.com/01org/ciao/ciao-controller/types"
 )
 
 var traceCommand = &command{
@@ -51,7 +51,7 @@ func (cmd *traceListCommand) parseArgs(args []string) []string {
 }
 
 func (cmd *traceListCommand) run(args []string) error {
-	var traces payloads.CiaoTracesSummary
+	var traces types.CiaoTracesSummary
 
 	url := buildComputeURL("traces")
 
@@ -102,7 +102,7 @@ func (cmd *traceShowCommand) run(args []string) error {
 		return errors.New("Missing required -label parameter")
 	}
 
-	var traceData payloads.CiaoTraceData
+	var traceData types.CiaoTraceData
 
 	url := buildComputeURL("traces/%s", cmd.label)
 

diff --git a/ciao-cli/workload.go b/ciao-cli/workload.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/01org/ciao/payloads"
+	"github.com/01org/ciao/openstack/compute"
 )
 
 var workloadCommand = &command{
@@ -53,7 +53,7 @@ func (cmd *workloadListCommand) run(args []string) error {
 		fatalf("Missing required -tenant-id parameter")
 	}
 
-	var flavors payloads.ComputeFlavorsDetails
+	var flavors compute.FlavorsDetails
 	if *tenantID == "" {
 		*tenantID = "faketenant"
 	}