Skip to content

Commit

Permalink
Merge pull request #12 from surajsub/master
Browse files Browse the repository at this point in the history
Network Ports Fix 1
  • Loading branch information
surajsub authored Apr 26, 2020
2 parents 36b0490 + 5f9b205 commit ca58b3f
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions clients/instance/ibm-pi-network.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import (
"log"
)

const getNetwork = "Get Networks for [ Network id (%s) ] and CloudInstance id - (%s) ] "
const getAllPortPrint = "Get Networks for [ Network id (%s) ] and CloudInstance id - (%s) ] "
const getPortPrint = "Get Port for [ Port id - (%s) and Network id - (%s) and CloudInstance id - (%s) ] "

type IBMPINetworkClient struct {
session *ibmpisession.IBMPISession
powerinstanceid string
Expand All @@ -22,7 +26,7 @@ func NewIBMPINetworkClient(sess *ibmpisession.IBMPISession, powerinstanceid stri
}

func (f *IBMPINetworkClient) Get(id, powerinstanceid string) (*models.Network, error) {

log.Printf(getNetwork, id, powerinstanceid)
params := p_cloud_networks.NewPcloudNetworksGetParams().WithCloudInstanceID(powerinstanceid).WithNetworkID(id)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksGet(params, ibmpisession.NewAuth(f.session, powerinstanceid))

Expand Down Expand Up @@ -62,9 +66,6 @@ func (f *IBMPINetworkClient) Create(name string, networktype string, cidr string
if resp != nil {
log.Printf("Failed to create the network ")
}
//if postok != nil {
// log.Print("Request failed ")
//}

return resp.Payload, nil, nil
}
Expand Down Expand Up @@ -98,9 +99,11 @@ func (f *IBMPINetworkClient) Delete(id string, powerinstanceid string) error {

//Get all
func (f *IBMPINetworkClient) GetAllPort(id string, powerinstanceid string) (*models.NetworkPorts, error) {

log.Printf(getAllPortPrint, id, powerinstanceid)
params := p_cloud_networks.NewPcloudNetworksPortsGetallParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithNetworkID(id)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPortsGetall(params, ibmpisession.NewAuth(f.session, powerinstanceid))

log.Printf("Printing the response %s", len(resp.Payload.Ports))
if err != nil || resp.Payload == nil {
log.Printf("Failed to perform the GetNetworkPorts Operation... %v", err)
return nil, errors.ToError(err)
Expand All @@ -112,6 +115,7 @@ func (f *IBMPINetworkClient) GetAllPort(id string, powerinstanceid string) (*mod
// Get Port

func (f *IBMPINetworkClient) GetPort(id string, powerinstanceid string, network_port_id string) (*models.NetworkPort, error) {
log.Printf(getPortPrint, network_port_id, id, powerinstanceid)
params := p_cloud_networks.NewPcloudNetworksPortsGetParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithNetworkID(id).WithPortID(network_port_id)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPortsGet(params, ibmpisession.NewAuth(f.session, powerinstanceid))

Expand Down

0 comments on commit ca58b3f

Please sign in to comment.