Skip to content
Snippets Groups Projects
Commit b37a109f authored by Fabian Seidl's avatar Fabian Seidl
Browse files

Resolve "Investigate if TransportOption and Transport are both required when... 

Resolve "Investigate if TransportOption and Transport are both required when creating network elements"

See merge request !530
parent 7ba08868
Branches
Tags
1 merge request!530Resolve "Investigate if TransportOption and Transport are both required when creating network elements"
Pipeline #160530 passed
Stage: tools
Stage: build
Stage: test
Stage: analyze
Stage: integration-test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
controller/nucleus/networkElement.go
+ 40
− 50
View file @ b37a109f
......@@ -229,7 +229,6 @@ func (n *CommonNetworkElement) MarshalJSON() ([]byte, error) {
var transportAddress string
var transportUsername string
var transportPassword string
var transportOptionType spb.Type
var transportTLS bool
// Handling of these cases is necessary as we use partial network elements for testing.
......@@ -240,14 +239,12 @@ func (n *CommonNetworkElement) MarshalJSON() ([]byte, error) {
transportAddress = "testing"
transportUsername = "testing"
transportPassword = "testing"
transportOptionType = spb.Type_TYPE_OPENCONFIG
transportTLS = false
} else {
transportType = n.transport.Type()
transportAddress = n.transportOptions.Address
transportUsername = n.transportOptions.Username
transportPassword = n.transportOptions.Password
transportOptionType = n.transportOptions.Type
transportTLS = n.transportOptions.Tls
}
......@@ -267,29 +264,27 @@ func (n *CommonNetworkElement) MarshalJSON() ([]byte, error) {
}
return json.Marshal(&struct {
ID uuid.UUID `json:"id,omitempty"`
Name string `json:"name,omitempty"`
TransportType string `json:"transport_type,omitempty"`
TransportAddress string `json:"transport_address,omitempty"`
TransportUsername string `json:"transport_username,omitempty"`
TransportPassword string `json:"transport_password,omitempty"`
TransportOptionType spb.Type `json:"transport_option"`
TransportTLS bool `json:"transport_tls"`
Plugin uuid.UUID `json:"plugin,omitempty"`
Model string `json:"model,omitempty"`
PndID uuid.UUID `json:"pnd_id,omitempty"`
ID uuid.UUID `json:"id,omitempty"`
Name string `json:"name,omitempty"`
TransportType string `json:"transport_type,omitempty"`
TransportAddress string `json:"transport_address,omitempty"`
TransportUsername string `json:"transport_username,omitempty"`
TransportPassword string `json:"transport_password,omitempty"`
TransportTLS bool `json:"transport_tls"`
Plugin uuid.UUID `json:"plugin,omitempty"`
Model string `json:"model,omitempty"`
PndID uuid.UUID `json:"pnd_id,omitempty"`
}{
ID: n.ID(),
Name: n.Name(),
TransportType: transportType,
TransportAddress: transportAddress,
TransportUsername: transportUsername,
TransportPassword: transportPassword,
TransportOptionType: transportOptionType,
TransportTLS: transportTLS,
Plugin: pluginUUID,
Model: string(modelAsString),
PndID: pndUUID,
ID: n.ID(),
Name: n.Name(),
TransportType: transportType,
TransportAddress: transportAddress,
TransportUsername: transportUsername,
TransportPassword: transportPassword,
TransportTLS: transportTLS,
Plugin: pluginUUID,
Model: string(modelAsString),
PndID: pndUUID,
})
}
......@@ -299,7 +294,6 @@ func (n *CommonNetworkElement) MarshalBSON() ([]byte, error) {
var transportAddress string
var transportUsername string
var transportPassword string
var transportOptionType spb.Type
var transportTLS bool
// Handling of these cases is necessary as we use partial network elements for testing.
......@@ -310,14 +304,12 @@ func (n *CommonNetworkElement) MarshalBSON() ([]byte, error) {
transportAddress = "testing"
transportUsername = "testing"
transportPassword = "testing"
transportOptionType = spb.Type_TYPE_OPENCONFIG
transportTLS = false
} else {
transportType = n.transport.Type()
transportAddress = n.transportOptions.Address
transportUsername = n.transportOptions.Username
transportPassword = n.transportOptions.Password
transportOptionType = n.transportOptions.Type
transportTLS = n.transportOptions.Tls
}
......@@ -329,29 +321,27 @@ func (n *CommonNetworkElement) MarshalBSON() ([]byte, error) {
}
return bson.Marshal(&struct {
ID string `bson:"_id,omitempty"`
Name string `bson:"name,omitempty"`
TransportType string `bson:"transport_type,omitempty"`
TransportAddress string `bson:"transport_address,omitempty"`
TransportUsername string `bson:"transport_username,omitempty"`
TransportPassword string `bson:"transport_password,omitempty"`
TransportOptionType spb.Type `bson:"transport_option"`
TransportTLS bool `bson:"transport_tls"`
Plugin string `bson:"plugin,omitempty"`
Model string `bson:"model,omitempty"`
PndID string `bson:"pnd_id,omitempty"`
ID string `bson:"_id,omitempty"`
Name string `bson:"name,omitempty"`
TransportType string `bson:"transport_type,omitempty"`
TransportAddress string `bson:"transport_address,omitempty"`
TransportUsername string `bson:"transport_username,omitempty"`
TransportPassword string `bson:"transport_password,omitempty"`
TransportTLS bool `bson:"transport_tls"`
Plugin string `bson:"plugin,omitempty"`
Model string `bson:"model,omitempty"`
PndID string `bson:"pnd_id,omitempty"`
}{
ID: n.ID().String(),
Name: n.Name(),
TransportType: transportType,
TransportAddress: transportAddress,
TransportUsername: transportUsername,
TransportPassword: transportPassword,
TransportOptionType: transportOptionType,
Plugin: pluginUUID.String(),
Model: modelAsString,
PndID: n.pndID.String(),
TransportTLS: transportTLS,
ID: n.ID().String(),
Name: n.Name(),
TransportType: transportType,
TransportAddress: transportAddress,
TransportUsername: transportUsername,
TransportPassword: transportPassword,
Plugin: pluginUUID.String(),
Model: modelAsString,
PndID: n.pndID.String(),
TransportTLS: transportTLS,
})
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment