Skip to content

Add new networkcontainer and orchestrator types #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2018
Merged

Add new networkcontainer and orchestrator types #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cns/NetworkContainerContract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ const (
const (
AzureContainerInstance = "AzureContainerInstance"
WebApps = "WebApps"
ClearContainer = "ClearContainer"
)

// Orchestrator Types
const (
Kubernetes = "Kubernetes"
Kubernetes = "Kubernetes"
ServiceFabric = "ServiceFabric"
)

// Encap Types
Expand Down
18 changes: 7 additions & 11 deletions cns/restserver/restserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,14 +820,9 @@ func (service *httpRestService) setOrchestratorType(w http.ResponseWriter, r *ht
service.lock.Lock()

switch req.OrchestratorType {
case cns.Kubernetes:
service.state.OrchestratorType = cns.Kubernetes
case cns.ServiceFabric, cns.Kubernetes, cns.WebApps:
service.state.OrchestratorType = req.OrchestratorType
service.saveState()
break
case cns.WebApps:
service.state.OrchestratorType = cns.WebApps
service.saveState()
break
default:
returnMessage = fmt.Sprintf("Invalid Orchestrator type %v", req.OrchestratorType)
returnCode = UnsupportedOrchestratorType
Expand Down Expand Up @@ -866,13 +861,14 @@ func (service *httpRestService) saveNetworkContainerGoalState(req cns.CreateNetw
CreateNetworkContainerRequest: req,
HostVersion: hostVersion}

if req.NetworkContainerType == cns.AzureContainerInstance {
if req.NetworkContainerType == cns.AzureContainerInstance ||
req.NetworkContainerType == cns.ClearContainer {
switch service.state.OrchestratorType {
case cns.Kubernetes:
case cns.Kubernetes, cns.ServiceFabric:
var podInfo cns.KubernetesPodInfo
err := json.Unmarshal(req.OrchestratorContext, &podInfo)
if err != nil {
errBuf := fmt.Sprintf("Unmarshalling AzureContainerInstanceInfo failed with error %v", err)
errBuf := fmt.Sprintf("Unmarshalling %s failed with error %v", req.NetworkContainerType, err)
return UnexpectedError, errBuf
}

Expand Down Expand Up @@ -980,7 +976,7 @@ func (service *httpRestService) getNetworkContainerResponse(req cns.GetNetworkCo
defer service.lock.Unlock()

switch service.state.OrchestratorType {
case cns.Kubernetes:
case cns.Kubernetes, cns.ServiceFabric:
var podInfo cns.KubernetesPodInfo
err := json.Unmarshal(req.OrchestratorContext, &podInfo)
if err != nil {
Expand Down