Skip to content

CNS Client API interface and skeleton implementation #615

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 3 commits into from
Jul 16, 2020
Merged

CNS Client API interface and skeleton implementation #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
956b036
Adding api template and skeleton to unblock Neha
pjohnst5 Jul 15, 2020
f81e82b
Removed new container type and reversed api order
pjohnst5 Jul 15, 2020
adbdea0
Fixed tests and reconcile call
pjohnst5 Jul 15, 2020
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
3 changes: 2 additions & 1 deletion cns/cnsclient/apiclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import "github.com/Azure/azure-container-networking/cns"

// APIClient interface to update cns state
type APIClient interface {
UpdateCNSState(createNetworkContainerRequest *cns.CreateNetworkContainerRequest) error
InitCNSState(*cns.CreateNetworkContainerRequest, map[string]*cns.KubernetesPodInfo) error
CreateOrUpdateNC(*cns.CreateNetworkContainerRequest) error
}
32 changes: 29 additions & 3 deletions cns/cnsclient/httpapi/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,34 @@ type Client struct {
RestService *restserver.HTTPRestService
}

// UpdateCNSState updates cns state
func (client *Client) UpdateCNSState(createNetworkContainerRequest *cns.CreateNetworkContainerRequest) error {
//Mat will pick up from here
// CreateOrUpdateNC updates cns state
func (client *Client) CreateOrUpdateNC(ncRequest *cns.CreateNetworkContainerRequest) error {
// var (
// ipConfigsToAdd []*cns.ContainerIPConfigState
// )

// //Lock to read ipconfigs
// client.RestService.Lock()

// //Only add ipconfigs that don't exist in cns state already
// for _, ipConfig := range ipConfigs {
// if _, ok := client.RestService.PodIPConfigState[ipConfig.ID]; !ok {
// ipConfig.State = cns.Available
// ipConfigsToAdd = append(ipConfigsToAdd, ipConfig)
// }
// }

// client.RestService.Unlock()
// leave empty
return nil //client.RestService.AddIPConfigsToState(ipConfigsToAdd)
}

// InitCNSState initializes cns state
func (client *Client) InitCNSState(ncRequest *cns.CreateNetworkContainerRequest, podInfoByIP map[string]*cns.KubernetesPodInfo) error {
// client.RestService.Lock()
// client.RestService.ReadyToIPAM = true
// client.RestService.Unlock()

// return client.RestService.AddIPConfigsToState(ipConfigs)
return nil
}
2 changes: 1 addition & 1 deletion cns/requestcontroller/kubecontroller/crdreconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (r *CrdReconciler) Reconcile(request reconcile.Request) (reconcile.Result,
}

//TODO: process the nc request on CNS side
r.CNSClient.UpdateCNSState(ncRequest)
r.CNSClient.CreateOrUpdateNC(ncRequest)

return reconcile.Result{}, nil
}
Expand Down
6 changes: 5 additions & 1 deletion cns/requestcontroller/kubecontroller/crdrequestcontroller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,15 @@ func (mc MockKubeClient) Update(ctx context.Context, obj runtime.Object, opts ..
type MockCNSClient struct{}

// we're just testing that reconciler interacts with CNS on Reconcile().
func (mi *MockCNSClient) UpdateCNSState(createNetworkContainerRequest *cns.CreateNetworkContainerRequest) error {
func (mi *MockCNSClient) CreateOrUpdateNC(ncRequest *cns.CreateNetworkContainerRequest) error {
mockCNSUpdated = true
return nil
}

func (mi *MockCNSClient) InitCNSState(ncRequest *cns.CreateNetworkContainerRequest, podInfoByIP map[string]*cns.KubernetesPodInfo) error {
return nil
}

func ResetCNSInteractionFlag() {
mockCNSUpdated = false
}
Expand Down