Skip to content

Commit

Permalink
Timeout Fixes-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@surajsub @surajibm
surajsub authored and surajibm committed Jun 2, 2020
1 parent 36e355c commit 7e24703
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions clients/instance/ibm-pi-network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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)
params := p_cloud_networks.NewPcloudNetworksGetParamsWithTimeout(getTimeOut).WithCloudInstanceID(powerinstanceid).WithNetworkID(id)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksGet(params, ibmpisession.NewAuth(f.session, powerinstanceid))

if err != nil || resp.Payload == nil {
Expand Down Expand Up @@ -56,7 +56,7 @@ func (f *IBMPINetworkClient) Create(name string, networktype string, cidr string
body.DNSServers = dnsservers

log.Printf("Printing the body %+v", body)
params := p_cloud_networks.NewPcloudNetworksPostParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithBody(&body)
params := p_cloud_networks.NewPcloudNetworksPostParamsWithTimeout(postTimeOut).WithCloudInstanceID(powerinstanceid).WithBody(&body)
_, resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPost(params, ibmpisession.NewAuth(f.session, powerinstanceid))

//log.Printf("The error is %d ",resp.Payload.VlanID)
Expand All @@ -74,7 +74,7 @@ func (f *IBMPINetworkClient) Create(name string, networktype string, cidr string
func (f *IBMPINetworkClient) GetPublic(cloud_instance_id string) (*models.Networks, error) {

filterQuery := "type=\"pub-vlan\""
params := p_cloud_networks.NewPcloudNetworksGetallParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(cloud_instance_id).WithFilter(&filterQuery)
params := p_cloud_networks.NewPcloudNetworksGetallParamsWithTimeout(getTimeOut).WithCloudInstanceID(cloud_instance_id).WithFilter(&filterQuery)

resp, err := f.session.Power.PCloudNetworks.PcloudNetworksGetall(params, ibmpisession.NewAuth(f.session, cloud_instance_id))

Expand All @@ -88,7 +88,7 @@ func (f *IBMPINetworkClient) GetPublic(cloud_instance_id string) (*models.Networ

// Delete ...
func (f *IBMPINetworkClient) Delete(id string, powerinstanceid string) error {
params := p_cloud_networks.NewPcloudNetworksDeleteParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithNetworkID(id)
params := p_cloud_networks.NewPcloudNetworksDeleteParamsWithTimeout(deleteTimeOut).WithCloudInstanceID(powerinstanceid).WithNetworkID(id)
_, err := f.session.Power.PCloudNetworks.PcloudNetworksDelete(params, ibmpisession.NewAuth(f.session, powerinstanceid))
if err != nil {
return errors.ToError(err)
Expand All @@ -102,7 +102,7 @@ func (f *IBMPINetworkClient) Delete(id string, powerinstanceid string) error {
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)
params := p_cloud_networks.NewPcloudNetworksPortsGetallParamsWithTimeout(getTimeOut).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 {
Expand All @@ -117,7 +117,7 @@ func (f *IBMPINetworkClient) GetAllPort(id string, powerinstanceid string) (*mod

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)
params := p_cloud_networks.NewPcloudNetworksPortsGetParamsWithTimeout(getTimeOut).WithCloudInstanceID(powerinstanceid).WithNetworkID(id).WithPortID(network_port_id)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPortsGet(params, ibmpisession.NewAuth(f.session, powerinstanceid))

if err != nil || resp.Payload == nil {
Expand All @@ -131,7 +131,7 @@ func (f *IBMPINetworkClient) GetPort(id string, powerinstanceid string, network_
//Create

func (f *IBMPINetworkClient) CreatePort(id string, powerinstanceid string, networkportdef *p_cloud_networks.PcloudNetworksPortsPostParams) (*models.NetworkPort, error) {
params := p_cloud_networks.NewPcloudNetworksPortsPostParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithNetworkID(id).WithBody(networkportdef.Body)
params := p_cloud_networks.NewPcloudNetworksPortsPostParamsWithTimeout(postTimeOut).WithCloudInstanceID(powerinstanceid).WithNetworkID(id).WithBody(networkportdef.Body)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPortsPost(params, ibmpisession.NewAuth(f.session, powerinstanceid))
if err != nil || resp.Payload == nil {
log.Printf("Failed to create the network port")
Expand All @@ -143,7 +143,7 @@ func (f *IBMPINetworkClient) CreatePort(id string, powerinstanceid string, netwo
// Delete

func (f *IBMPINetworkClient) DeletePort(networkid string, powerinstanceid string, portid string) (*models.Object, error) {
params := p_cloud_networks.NewPcloudNetworksPortsDeleteParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithNetworkID(networkid).WithPortID(portid)
params := p_cloud_networks.NewPcloudNetworksPortsDeleteParamsWithTimeout(deleteTimeOut).WithCloudInstanceID(powerinstanceid).WithNetworkID(networkid).WithPortID(portid)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPortsDelete(params, ibmpisession.NewAuth(f.session, powerinstanceid))

if err != nil || resp.Payload == nil {
Expand All @@ -161,7 +161,7 @@ func (f *IBMPINetworkClient) AttachPort(powerinstanceid, network_id, port_id, de
body.Description = &description
body.PvmInstanceID = &pvminstanceid
log.Printf("Attaching the port with id [%s] that belongs to cloud instance [%s] and networkid [%s] to the instance with id [%s]", port_id, powerinstanceid, network_id, pvminstanceid)
params := p_cloud_networks.NewPcloudNetworksPortsPutParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithNetworkID(network_id).WithPortID(port_id).WithBody(&body)
params := p_cloud_networks.NewPcloudNetworksPortsPutParamsWithTimeout(postTimeOut).WithCloudInstanceID(powerinstanceid).WithNetworkID(network_id).WithPortID(port_id).WithBody(&body)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPortsPut(params, ibmpisession.NewAuth(f.session, powerinstanceid))

if err != nil {
Expand All @@ -179,7 +179,7 @@ func (f *IBMPINetworkClient) DetachPort(powerinstanceid, network_id, port_id str
var body = models.NetworkPortUpdate{}
body.PvmInstanceID = nil

params := p_cloud_networks.NewPcloudNetworksPortsPutParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithNetworkID(network_id).WithPortID(port_id).WithBody(&body)
params := p_cloud_networks.NewPcloudNetworksPortsPutParamsWithTimeout(deleteTimeOut).WithCloudInstanceID(powerinstanceid).WithNetworkID(network_id).WithPortID(port_id).WithBody(&body)
resp, err := f.session.Power.PCloudNetworks.PcloudNetworksPortsPut(params, ibmpisession.NewAuth(f.session, powerinstanceid))

if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions clients/instance/ibm-pi-snapshot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (f *IBMPISnapshotClient) Get(id, powerinstanceid string) (*models.Snapshot,
log.Printf("Calling the Snapshotget Method..")
log.Printf("The input snapshot name is %s and to the cloudinstance id %s", id, powerinstanceid)

params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsGetParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithSnapshotID(id)
params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsGetParamsWithTimeout(getTimeOut).WithCloudInstanceID(powerinstanceid).WithSnapshotID(id)
resp, err := f.session.Power.PCloudSnapshots.PcloudCloudinstancesSnapshotsGet(params, ibmpisession.NewAuth(f.session, powerinstanceid))

if err != nil || resp.Payload == nil {
Expand All @@ -41,7 +41,7 @@ func (f *IBMPISnapshotClient) Get(id, powerinstanceid string) (*models.Snapshot,
// Delete ...
func (f *IBMPISnapshotClient) Delete(id string, powerinstanceid string) error {
//var cloudinstanceid = f.session.PowerServiceInstance
params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsDeleteParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithSnapshotID(id)
params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsDeleteParamsWithTimeout(deleteTimeOut).WithCloudInstanceID(powerinstanceid).WithSnapshotID(id)
_, err := f.session.Power.PCloudSnapshots.PcloudCloudinstancesSnapshotsDelete(params, ibmpisession.NewAuth(f.session, powerinstanceid))
if err != nil {
return errors.ToError(err)
Expand All @@ -52,7 +52,7 @@ func (f *IBMPISnapshotClient) Delete(id string, powerinstanceid string) error {
// Update..
func (f *IBMPISnapshotClient) Update(id, powerinstanceid string, snapshotdef *models.SnapshotUpdate) (models.Object, error) {

params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsPutParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithSnapshotID(id).WithBody(snapshotdef)
params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsPutParamsWithTimeout(postTimeOut).WithCloudInstanceID(powerinstanceid).WithSnapshotID(id).WithBody(snapshotdef)

resp, err := f.session.Power.PCloudSnapshots.PcloudCloudinstancesSnapshotsPut(params, ibmpisession.NewAuth(f.session, powerinstanceid))

Expand All @@ -68,7 +68,7 @@ func (f *IBMPISnapshotClient) Update(id, powerinstanceid string, snapshotdef *mo
func (f *IBMPISnapshotClient) GetAll(id, powerinstanceid string) (*models.Snapshots, error) {

log.Printf("Calling the Power Snapshots GetAll Method")
params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsGetallParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid)
params := p_cloud_snapshots.NewPcloudCloudinstancesSnapshotsGetallParamsWithTimeout(getTimeOut).WithCloudInstanceID(powerinstanceid)
resp, err := f.session.Power.PCloudSnapshots.PcloudCloudinstancesSnapshotsGetall(params, ibmpisession.NewAuth(f.session, powerinstanceid))
if err != nil {
return nil, errors.ToError(err)
Expand All @@ -81,7 +81,7 @@ func (f *IBMPISnapshotClient) GetAll(id, powerinstanceid string) (*models.Snapsh

func (f *IBMPISnapshotClient) Create(pvminstanceid, powerinstanceid, snapshotid, restorefailAction string) (*models.Snapshot, error) {
log.Printf("Calling the Power Snapshots Restore Method")
params := p_cloud_p_vm_instances.NewPcloudPvminstancesSnapshotsRestorePostParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithCloudInstanceID(pvminstanceid).WithSnapshotID(snapshotid).WithRestoreFailAction(&restorefailAction)
params := p_cloud_p_vm_instances.NewPcloudPvminstancesSnapshotsRestorePostParamsWithTimeout(postTimeOut).WithCloudInstanceID(powerinstanceid).WithCloudInstanceID(pvminstanceid).WithSnapshotID(snapshotid).WithRestoreFailAction(&restorefailAction)
resp, err := f.session.Power.PCloudPVMInstances.PcloudPvminstancesSnapshotsRestorePost(params, ibmpisession.NewAuth(f.session, powerinstanceid))
if err != nil {
return nil, fmt.Errorf("Failed to create the restore")
Expand Down
10 changes: 5 additions & 5 deletions clients/instance/ibm-pi-volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (f *IBMPIVolumeClient) Create(volumename string, volumesize float64, volume
// Delete ...
func (f *IBMPIVolumeClient) Delete(id string, powerinstanceid string) error {
//var cloudinstanceid = f.session.PowerServiceInstance
params := p_cloud_volumes.NewPcloudCloudinstancesVolumesDeleteParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithVolumeID(id)
params := p_cloud_volumes.NewPcloudCloudinstancesVolumesDeleteParamsWithTimeout(deleteTimeOut).WithCloudInstanceID(powerinstanceid).WithVolumeID(id)
_, err := f.session.Power.PCloudVolumes.PcloudCloudinstancesVolumesDelete(params, ibmpisession.NewAuth(f.session, powerinstanceid))
if err != nil {
return errors.ToError(err)
Expand All @@ -87,7 +87,7 @@ func (f *IBMPIVolumeClient) Update(id, volumename string, volumesize float64, vo
patchbody.Name = &volumename
patchbody.Size = volumesize
patchbody.Shareable = &volumeshare
params := p_cloud_volumes.NewPcloudCloudinstancesVolumesPutParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithVolumeID(id).WithBody(&patchbody)
params := p_cloud_volumes.NewPcloudCloudinstancesVolumesPutParamsWithTimeout(postTimeOut).WithCloudInstanceID(powerinstanceid).WithVolumeID(id).WithBody(&patchbody)

resp, err := f.session.Power.PCloudVolumes.PcloudCloudinstancesVolumesPut(params, ibmpisession.NewAuth(f.session, powerinstanceid))

Expand All @@ -104,7 +104,7 @@ func (f *IBMPIVolumeClient) Attach(id, volumename string, powerinstanceid string

log.Printf("Calling the Power Volume Attach method")

params := p_cloud_volumes.NewPcloudPvminstancesVolumesPostParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithPvmInstanceID(id).WithVolumeID(volumename)
params := p_cloud_volumes.NewPcloudPvminstancesVolumesPostParamsWithTimeout(getTimeOut).WithCloudInstanceID(powerinstanceid).WithPvmInstanceID(id).WithVolumeID(volumename)
resp, err := f.session.Power.PCloudVolumes.PcloudPvminstancesVolumesPost(params, ibmpisession.NewAuth(f.session, powerinstanceid))
if err != nil {
return nil, errors.ToError(err)
Expand All @@ -120,7 +120,7 @@ func (f *IBMPIVolumeClient) Attach(id, volumename string, powerinstanceid string
func (f *IBMPIVolumeClient) Detach(id, volumename string, powerinstanceid string) (models.Object, error) {
log.Printf("Calling the Power Volume Detach method")

params := p_cloud_volumes.NewPcloudPvminstancesVolumesDeleteParamsWithTimeout(f.session.Timeout).WithCloudInstanceID(powerinstanceid).WithPvmInstanceID(id).WithVolumeID(volumename)
params := p_cloud_volumes.NewPcloudPvminstancesVolumesDeleteParamsWithTimeout(deleteTimeOut).WithCloudInstanceID(powerinstanceid).WithPvmInstanceID(id).WithVolumeID(volumename)
resp, err := f.session.Power.PCloudVolumes.PcloudPvminstancesVolumesDelete(params, ibmpisession.NewAuth(f.session, powerinstanceid))

if err != nil {
Expand All @@ -136,7 +136,7 @@ func (f *IBMPIVolumeClient) Detach(id, volumename string, powerinstanceid string
func (f *IBMPIVolumeClient) GetAll(id, cloud_instance_id string) (*models.Volumes, error) {

log.Printf("Calling the Power Volumes GetAll Method")
params := p_cloud_volumes.NewPcloudPvminstancesVolumesGetallParamsWithTimeout(f.session.Timeout).WithPvmInstanceID(id).WithCloudInstanceID(cloud_instance_id)
params := p_cloud_volumes.NewPcloudPvminstancesVolumesGetallParamsWithTimeout(getTimeOut).WithPvmInstanceID(id).WithCloudInstanceID(cloud_instance_id)
resp, err := f.session.Power.PCloudVolumes.PcloudPvminstancesVolumesGetall(params, ibmpisession.NewAuth(f.session, cloud_instance_id))
if err != nil {
return nil, errors.ToError(err)
Expand Down

0 comments on commit 7e24703

Please # to comment.