Skip to content
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

Swtich NetworkAdapter fields from common.LinksCollection to common.Link #329

Merged
merged 1 commit into from
May 6, 2024
+20 −100
Merged

Swtich NetworkAdapter fields from common.LinksCollection to common.Link #329

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
120 changes: 20 additions & 100 deletions redfish/networkadapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ type NetworkAdapter struct {
assembly string
// Certificates shall contain a link to a resource collection of type CertificateCollection that contains
// certificates for device identity and attestation.
certificates []string
certificates string
// Controllers shall contain the set of network controllers ASICs that make
// up this NetworkAdapter.
Controllers []Controllers
Expand All @@ -343,21 +343,21 @@ type NetworkAdapter struct {
Model string
// NetworkDeviceFunctions shall be a link to a collection of type
// NetworkDeviceFunctionCollection.
networkDeviceFunctions []string
networkDeviceFunctions string
// NetworkPorts shall be a link to a collection of type NetworkPortCollection.
// This property has been deprecated in favor of the Ports property.
networkPorts []string
networkPorts string
// Oem shall contain the OEM extensions. All values for properties that this object contains shall conform to the
// Redfish Specification-described requirements.
OEM json.RawMessage `json:"Oem"`
// PartNumber shall contain the part number for the network adapter as
// defined by the manufacturer.
PartNumber string
// Ports shall contain a link to a resource collection of type PortCollection.
ports []string
ports string
// Processors shall contain a link to a resource collection of type ProcessorCollection that represent the offload
// processors contained in this network adapter.
processors []string
processors string
// SKU shall contain the Stock Keeping Unit (SKU) for the network adapter.
SKU string
// SerialNumber shall contain the serial number for the network adapter.
Expand All @@ -380,12 +380,12 @@ func (networkadapter *NetworkAdapter) UnmarshalJSON(b []byte) error {
var t struct {
temp
Assembly common.Link
Certificates common.LinksCollection
Certificates common.Link
EnvironmentMetrics common.Link
NetworkDeviceFunctions common.LinksCollection
NetworkPorts common.LinksCollection
Ports common.LinksCollection
Processors common.LinksCollection
NetworkDeviceFunctions common.Link
NetworkPorts common.Link
Ports common.Link
Processors common.Link
Actions actions
}

Expand All @@ -397,12 +397,12 @@ func (networkadapter *NetworkAdapter) UnmarshalJSON(b []byte) error {
// Extract the links to other entities for later
*networkadapter = NetworkAdapter(t.temp)
networkadapter.assembly = t.Assembly.String()
networkadapter.certificates = t.Certificates.ToStrings()
networkadapter.certificates = t.Certificates.String()
networkadapter.environmentMetrics = t.EnvironmentMetrics.String()
networkadapter.networkDeviceFunctions = t.NetworkDeviceFunctions.ToStrings()
networkadapter.networkPorts = t.NetworkPorts.ToStrings()
networkadapter.ports = t.Ports.ToStrings()
networkadapter.processors = t.Processors.ToStrings()
networkadapter.networkDeviceFunctions = t.NetworkDeviceFunctions.String()
networkadapter.networkPorts = t.NetworkPorts.String()
networkadapter.ports = t.Ports.String()
networkadapter.processors = t.Processors.String()

networkadapter.resetSettingsToDefaultTarget = t.Actions.ResetSettingsToDefault.Target

Expand Down Expand Up @@ -485,23 +485,7 @@ func (networkadapter *NetworkAdapter) Assembly() (*Assembly, error) {

// Certificatea gets the certificates for device identity and attestation.
func (networkadapter *NetworkAdapter) Certificates() ([]*Certificate, error) {
var result []*Certificate

collectionError := common.NewCollectionError()
for _, uri := range networkadapter.certificates {
unit, err := GetCertificate(networkadapter.GetClient(), uri)
if err != nil {
collectionError.Failures[uri] = err
} else {
result = append(result, unit)
}
}

if collectionError.Empty() {
return result, nil
}

return result, collectionError
return ListReferencedCertificates(networkadapter.GetClient(), networkadapter.certificates)
}

// EnvironmentMetrics gets the environment metrics for this network adapter.
Expand All @@ -514,86 +498,22 @@ func (networkadapter *NetworkAdapter) EnvironmentMetrics() (*EnvironmentMetrics,

// NetworkDeviceFunctions gets the collection of NetworkDeviceFunctions of this network adapter
func (networkadapter *NetworkAdapter) NetworkDeviceFunctions() ([]*NetworkDeviceFunction, error) {
var result []*NetworkDeviceFunction

collectionError := common.NewCollectionError()
for _, uri := range networkadapter.networkDeviceFunctions {
unit, err := GetNetworkDeviceFunction(networkadapter.GetClient(), uri)
if err != nil {
collectionError.Failures[uri] = err
} else {
result = append(result, unit)
}
}

if collectionError.Empty() {
return result, nil
}

return result, collectionError
return ListReferencedNetworkDeviceFunctions(networkadapter.GetClient(), networkadapter.networkDeviceFunctions)
}

// NetworkPorts gets the collection of NetworkPorts for this network adapter
func (networkadapter *NetworkAdapter) NetworkPorts() ([]*NetworkPort, error) {
var result []*NetworkPort

collectionError := common.NewCollectionError()
for _, uri := range networkadapter.networkPorts {
unit, err := GetNetworkPort(networkadapter.GetClient(), uri)
if err != nil {
collectionError.Failures[uri] = err
} else {
result = append(result, unit)
}
}

if collectionError.Empty() {
return result, nil
}

return result, collectionError
return ListReferencedNetworkPorts(networkadapter.GetClient(), networkadapter.networkPorts)
}

// Ports gets the ports associated with this network adapter.
func (networkadapter *NetworkAdapter) Ports() ([]*Port, error) {
var result []*Port

collectionError := common.NewCollectionError()
for _, uri := range networkadapter.ports {
unit, err := GetPort(networkadapter.GetClient(), uri)
if err != nil {
collectionError.Failures[uri] = err
} else {
result = append(result, unit)
}
}

if collectionError.Empty() {
return result, nil
}

return result, collectionError
return ListReferencedPorts(networkadapter.GetClient(), networkadapter.ports)
}

// Processors gets the offload processors contained in this network adapter.
func (networkadapter *NetworkAdapter) Processors() ([]*Processor, error) {
var result []*Processor

collectionError := common.NewCollectionError()
for _, uri := range networkadapter.networkPorts {
unit, err := GetProcessor(networkadapter.GetClient(), uri)
if err != nil {
collectionError.Failures[uri] = err
} else {
result = append(result, unit)
}
}

if collectionError.Empty() {
return result, nil
}

return result, collectionError
return ListReferencedProcessors(networkadapter.GetClient(), networkadapter.processors)
}

// ResetSettingsToDefault shall perform a reset of all active and pending
Expand Down