-
Notifications
You must be signed in to change notification settings - Fork 21
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.
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
adding support for SAS Interconnects #166
Open
mpolski
wants to merge
1
commit into
HewlettPackard:master
Choose a base branch
from
mpolski:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,142 @@ | ||
package ov | ||
|
||
import ( | ||
"encoding/json" | ||
|
||
"github.com/HewlettPackard/oneview-golang/rest" | ||
"github.com/HewlettPackard/oneview-golang/utils" | ||
"github.com/docker/machine/libmachine/log" | ||
) | ||
|
||
type SasInterconnectList struct { | ||
Type string `json:"type,omitempty"` // "Type": "SasInterconnectListV3" | ||
URI utils.Nstring `json:"uri,omitempty"` // "uri": "/rest/sas-interconnects?sort=name:asc" | ||
Category string `json:"category,omitempty"` // "category": sas-interconnects | ||
Start int `json:"start,omitempty"` // "start": 0, | ||
Count int `json:"count,omitempty"` // "count": 1, | ||
Total int `json:"total,omitempty"` // "total": 1, | ||
PrevPageURI utils.Nstring `json:"prevPageUri,omitempty"` // "prevPageUri": null, | ||
NextPageURI utils.Nstring `json:"nextPageUri,omitempty"` // "nextPageUri": null, | ||
Members []SasInterconnects `json:"members,omitempty"` // "members": [] | ||
} | ||
|
||
type SasInterconnects struct { | ||
Type string `json:"type,omitempty"` // "type": "SasInterconnectListV3" | ||
URI utils.Nstring `json:"uri,omitempty"` // "uri": "/rest/sas-interconnects/TWT732W0CY" | ||
Category string `json:"category"` // "category": "sas-interconnects" | ||
ETag string `json:"eTag,omitempty"` // "eTag": "463bd328-ffc8-40ae-9603-6136fa9e6e58", | ||
Created string `json:"created,omitempty"` // "created": "2018-08-02T15:49:59.963Z", | ||
Modified string `json:"modified,omitempty"` // "modified": "2018-12-03T18:26:43.335Z", | ||
RefreshState string `json:"refreshState,omitempty"` // "refreshState": "NotRefreshing" | ||
StateReason string `json:"stateReason,omitempty"` // "stateReason": null | ||
InterconnectLocation SASInterconnectLocation `json:"interconnectLocation"` // "interconnectLocation": {} | ||
PowerState string `json:"powerState,omitempty"` // "powerState": "On", | ||
HardResetState string `json:"hardResetState,omitempty"` // "hardResetState": "Normal" | ||
SoftResetState string `json:"softResetState,omitempty"` // "softResetState": "Normal" | ||
InterconnectIP string `json:"interconnectIP,omitempty"` // "interconnectIP": "fe80::9eb6:54ff:fe91:2170" | ||
FirmwareVersion string `json:"firmwareVersion,omitempty"` // "firmwareVersion": "1.5.11.0", | ||
ProductName string `json:"productName,omitempty"` // "productName": "Synergy 12Gb SAS Connection Module" | ||
Model string `json:"model,omitempty"` // "model": "Synergy 12Gb SAS Connection Module" | ||
SasWWN string `json:"sasWWN,omitempty"` // "sasWWN": "50014380421BE900" | ||
EnclosureURI utils.Nstring `json:"enclosureUri,omitempty"` // "enclosureUri": "/rest/enclosures/013645CN759000AC" | ||
SerialNumber string `json:"serialNumber,omitempty"` // "serialNumber": "TWT732W0CY", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you please keep all the fields in alphabetical order? |
||
PartNumber string `json:"partNumber,omitempty"` // "partNumber": "755985-B21", | ||
SasLogicalInterconnectURI utils.Nstring `json:"sasLogicalInterconnectUri,omitempty"` // "sasLogicalInterconnectUri": "/rest/sas-logical-interconnects/c6e17ed8-de41-4d53-aa50-2da58a0d63b8" | ||
InterconnectTypeURI utils.Nstring `json:"interconnectTypeUri,omitempty"` //"interconnectTypeURI": "/rest/sas-interconnect-types/Synergy12GbSASConnectionModule" | ||
PortCount int `json:"portCount,omitempty"` // "portCount": 12, | ||
EnclosureName string `json:"enclosureName,omitempty"` // "enclosureName": "CEC" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. EnclosureName and InitialScopeUris feilds are missing. |
||
UIDState string `json:"uidState,omitempty"` // "uidState": "Off" | ||
SasPorts []SasPorts `json:"sasPorts,omitempty"` // "sasPorts": [] | ||
RemoteSupportSettings SASRemoteSupportSettings `json:"remoteSupportSettings,omitempty"` // "remoteSupportSettings": {} | ||
SparePartNumber string `json:"sparePartNumber,omitempty"` // "sparePartNumber": "758686-001" | ||
ScopesURI string `json:"scopesUri,omitempty"` // "scopesUri": "/rest/scopes/resources/rest/sas-interconnects/TWT732W0CY", | ||
LogicalSasInterconnectURI string `json:"logicalSasInterconnectUri,omitempty"` //"logicalSasInterconnectUri": "/rest/sas-logical-interconnects/c6e17ed8-de41-4d53-aa50-2da58a0d63b8" | ||
Description utils.Nstring `json:"description,omitempty"` // Description": null | ||
State string `json:"state,omnitempty"` // "state": "Configured" | ||
Status string `json:"status,omitempty"` // "status": "OK" | ||
Name string `json:"name,omitempty"` // "name": "CEC, interconnect 4" | ||
} | ||
|
||
type SASInterconnectLocation struct { | ||
LocationEntries []SASLocationEntries `json:"locationEntries"` // "locationEntries": [] | ||
} | ||
|
||
type SASLocationEntries struct { | ||
Type string `json:"type"` // "type": "bay" | ||
Value string `json:"value"` // "value": "4" | ||
} | ||
|
||
type SasPorts struct { | ||
Type string `json:"type,omitempty"` // "type": "sas-port", | ||
URI string `json:"uri,omitempty"` //"uri": "/rest/sas-interconnects/TWT732W0CY/sas-ports/e0ff4925-b690-45ab-a186-9f5a9d7362dd" | ||
Category string `json:"category,omitempty"` // "category": "sas-ports" | ||
ETag string `json:"eTag,omitempty"` // "eTag": "2019-04-10T16:15:11.080Z", | ||
Created string `json:"created,omitempty"` // "created": "2019-04-10T13:40:56.059Z", | ||
Modified string `json:"modified,omitempty"` // "modified": "2019-04-10T16:15:11.080Z", | ||
PortIdentifier string `json:"portIdentifier,omitempty"` // "portIdentifier": "11", | ||
PhyCount int `json:"phyCount,omitempty"` // "phyCount": 4, | ||
PortName string `json:"portName,omitempty"` // "portName": "11", | ||
PortType string `json:"portType,omitempty"` // "portType": "Downlink", | ||
PortLocation string `json:"portLocation,omitempty"` // "portLocation": "11", | ||
Enabled bool `json:"enabled,omitempty"` // "enabled": true, | ||
PortStatusReason string `json:"portStatusReason,omitempty"` // "portStatusReason": "None", | ||
LinkedPortURI utils.Nstring `json:"linkedPortUri,omitempty"` // "linkedPortUri": null, | ||
ContainerDeviceURI string `json:"containerDeviceUri,omitempty"` // "containerDeviceUri": "/rest/sas-interconnects/TWT732W0CY", | ||
Description string `json:"description,omitempty"` // "description": null, | ||
State string `json:"state,omitempty"` // "state": "Unlinked", | ||
Status string `json:"status,omitempty"` // "status": "DISABLED", | ||
Name string `json:"name,omitempty"` // "name": "11" | ||
} | ||
|
||
type SASRemoteSupportSettings struct { | ||
RemoteSupportURI string `json:"remoteSupportUri,omitempty"` // "remoteSupportUri": "/rest/support/sas-interconnects/TWT732W0CY" | ||
SupportDataCollectionsURI string `json:"supportDataCollectionsUri,omitempty"` // "supportDataCollectionsUri": "/rest/support/data-collections?deviceID=TWT732W0CY&category=sas-interconnects" | ||
Destination string `json:"destination,omitempty"` // "destination": "" | ||
RemoteSupportCurrentState string `json:"remoteSupportCurrentState,omitempty"` // "remoteSupportCurrentState": "Unregistered" | ||
SupportDataCollectionState string `json:"supportDataCollectionState,omitempty"` // "supportDataCollectionState": null | ||
SupportDataCollectionType string `json:"supportDataCollectionType,omitempty"` // "supportDataCollectionType": null | ||
SupportState string `json:"supportState,omitempty"` // "supportState": "Disabled" | ||
} | ||
|
||
func (c *OVClient) GetSasInterconnects(count string, filter []string, query string, sort string, start string) (SasInterconnectList, error) { | ||
var ( | ||
uri = "/rest/sas-interconnects" | ||
q map[string]interface{} | ||
sasInterconnects SasInterconnectList | ||
) | ||
q = make(map[string]interface{}) | ||
if len(filter) > 0 { | ||
q["filter"] = filter | ||
} | ||
|
||
if sort != "" { | ||
q["sort"] = sort | ||
} | ||
|
||
if start != "" { | ||
q["start"] = start | ||
} | ||
|
||
if count != "" { | ||
q["count"] = count | ||
} | ||
|
||
// refresh login | ||
c.RefreshLogin() | ||
c.SetAuthHeaderOptions(c.GetAuthHeaderMap()) | ||
// Setup query | ||
if len(q) > 0 { | ||
c.SetQueryString(q) | ||
} | ||
|
||
data, err := c.RestAPICall(rest.GET, uri, nil) | ||
if err != nil { | ||
return sasInterconnects, err | ||
} | ||
|
||
log.Debugf("GetSasInterconnects %s", data) | ||
if err := json.Unmarshal([]byte(data), &sasInterconnects); err != nil { | ||
return sasInterconnects, err | ||
} | ||
return sasInterconnects, nil | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to create a new Struct, InterconnectLocation struct exists in interconnect.go file. You can make use of it.