Skip to content
Snippets Groups Projects
Commit be3a6e91 authored by Neil Schark's avatar Neil Schark
Browse files

made uuid param optional

parent 8287846f
No related branches found
No related tags found
1 merge request!404Enable export and import of SDN configuration
Pipeline #124561 failed
...@@ -16,7 +16,7 @@ type NetworkDomain interface { ...@@ -16,7 +16,7 @@ type NetworkDomain interface {
Destroy() error Destroy() error
AddSbi(s southbound.SouthboundInterface) error AddSbi(s southbound.SouthboundInterface) error
RemoveSbi(uuid.UUID) error RemoveSbi(uuid.UUID) error
AddNetworkElement(name string, opts *tpb.TransportOption, sid uuid.UUID, networkElement uuid.UUID) (uuid.UUID, error) AddNetworkElement(name string, opts *tpb.TransportOption, sid uuid.UUID, optionalNetworkElementID ...uuid.UUID) (uuid.UUID, error)
GetNetworkElement(identifier string) (networkelement.NetworkElement, error) GetNetworkElement(identifier string) (networkelement.NetworkElement, error)
RemoveNetworkElement(uuid.UUID) error RemoveNetworkElement(uuid.UUID) error
UpdateNetworkElement(networkelement.NetworkElement, string) error UpdateNetworkElement(networkelement.NetworkElement, string) error
......
...@@ -24,13 +24,20 @@ type NetworkDomain struct { ...@@ -24,13 +24,20 @@ type NetworkDomain struct {
mock.Mock mock.Mock
} }
// AddNetworkElement provides a mock function with given fields: name, opts, sid, networkElement // AddNetworkElement provides a mock function with given fields: name, opts, sid, optionalNetworkElementID
func (_m *NetworkDomain) AddNetworkElement(name string, opts *transport.TransportOption, sid uuid.UUID, networkElement uuid.UUID) (uuid.UUID, error) { func (_m *NetworkDomain) AddNetworkElement(name string, opts *transport.TransportOption, sid uuid.UUID, optionalNetworkElementID ...uuid.UUID) (uuid.UUID, error) {
ret := _m.Called(name, opts, sid, networkElement) _va := make([]interface{}, len(optionalNetworkElementID))
for _i := range optionalNetworkElementID {
_va[_i] = optionalNetworkElementID[_i]
}
var _ca []interface{}
_ca = append(_ca, name, opts, sid)
_ca = append(_ca, _va...)
ret := _m.Called(_ca...)
var r0 uuid.UUID var r0 uuid.UUID
if rf, ok := ret.Get(0).(func(string, *transport.TransportOption, uuid.UUID, uuid.UUID) uuid.UUID); ok { if rf, ok := ret.Get(0).(func(string, *transport.TransportOption, uuid.UUID, ...uuid.UUID) uuid.UUID); ok {
r0 = rf(name, opts, sid, networkElement) r0 = rf(name, opts, sid, optionalNetworkElementID...)
} else { } else {
if ret.Get(0) != nil { if ret.Get(0) != nil {
r0 = ret.Get(0).(uuid.UUID) r0 = ret.Get(0).(uuid.UUID)
...@@ -38,8 +45,8 @@ func (_m *NetworkDomain) AddNetworkElement(name string, opts *transport.Transpor ...@@ -38,8 +45,8 @@ func (_m *NetworkDomain) AddNetworkElement(name string, opts *transport.Transpor
} }
var r1 error var r1 error
if rf, ok := ret.Get(1).(func(string, *transport.TransportOption, uuid.UUID, uuid.UUID) error); ok { if rf, ok := ret.Get(1).(func(string, *transport.TransportOption, uuid.UUID, ...uuid.UUID) error); ok {
r1 = rf(name, opts, sid, networkElement) r1 = rf(name, opts, sid, optionalNetworkElementID...)
} else { } else {
r1 = ret.Error(1) r1 = ret.Error(1)
} }
......
...@@ -246,7 +246,12 @@ func (pnd *pndImplementation) RemoveSbi(sid uuid.UUID) error { ...@@ -246,7 +246,12 @@ func (pnd *pndImplementation) RemoveSbi(sid uuid.UUID) error {
} }
// AddNetworkElement adds a new network element to the PND. The UUID for the networkElementID is optional and should normally be empty // AddNetworkElement adds a new network element to the PND. The UUID for the networkElementID is optional and should normally be empty
func (pnd *pndImplementation) AddNetworkElement(name string, opt *tpb.TransportOption, sid uuid.UUID, networkElementID uuid.UUID) (uuid.UUID, error) { func (pnd *pndImplementation) AddNetworkElement(name string, opt *tpb.TransportOption, sid uuid.UUID, optionalNetworkElementID ...uuid.UUID) (uuid.UUID, error) {
networkElementID := uuid.Nil
if len(optionalNetworkElementID) > 0 {
networkElementID = optionalNetworkElementID[0]
}
labels := prometheus.Labels{"type": opt.Type.String()} labels := prometheus.Labels{"type": opt.Type.String()}
start := metrics.StartHook(labels, networkElementCreationsTotal) start := metrics.StartHook(labels, networkElementCreationsTotal)
defer metrics.FinishHook(labels, start, networkElementCreationDurationSecondsTotal, networkElementCreationDurationSeconds) defer metrics.FinishHook(labels, start, networkElementCreationDurationSecondsTotal, networkElementCreationDurationSeconds)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment