diff --git a/cli/cmd/networkElementCreate.go b/cli/cmd/networkElementCreate.go index eeb8c151994754d3046adc9aed5361334a43a882..c16d2acac24541540aca996a42da96717e8afdb3 100644 --- a/cli/cmd/networkElementCreate.go +++ b/cli/cmd/networkElementCreate.go @@ -96,12 +96,14 @@ var mneName string var opcode string var pluginID string +var pluginIDFlagName = "plugin-id" + func init() { networkElementCmd.AddCommand(networkElementCreateCmd) networkElementCreateCmd.Flags().StringVar(&mneName, "name", "", "add a network element name (optional)") networkElementCreateCmd.Flags().StringVar(&opcode, "type", "", "generation target (csbi or plugin)") - networkElementCreateCmd.Flags().StringVar(&pluginID, "plugin-id", "", "the plugin ID of the plugin to be used") + networkElementCreateCmd.Flags().StringVar(&pluginID, pluginIDFlagName, "", "the plugin ID of the plugin to be used") networkElementCreateCmd.Flags().StringVarP(&address, "address", "a", "", "address of a gnmi target, e.g. 192.168.1.1:6030") networkElementCreateCmd.Flags().StringVarP(&username, "username", "u", "", "username for a gnmi resource") networkElementCreateCmd.Flags().StringVarP(&password, "password", "p", "", "password for a gnmi resource") diff --git a/cli/cmd/prompt.go b/cli/cmd/prompt.go index 00309d4103f71663b0ef811a97bfe777fe597d1a..945c6d78dec8f4ae4e855d802c01900de41c1f03 100644 --- a/cli/cmd/prompt.go +++ b/cli/cmd/prompt.go @@ -220,10 +220,9 @@ func completionBasedOnCmd(c *PromptCompleter, cmd *cobra.Command, inputSplit []s } case networkElementCreateCmd: if len(inputFlags) != 0 { - // TODO: remove hardcoded `plugin-id` - if inputFlags[len(inputFlags)-1] == "--plugin-id" && - ((inputSplit[len(inputSplit)-1] == "--plugin-id" && d.GetWordBeforeCursor() == "") || - (inputSplit[len(inputSplit)-2] == "--plugin-id" && d.GetWordBeforeCursor() != "")) { + if inputFlags[len(inputFlags)-1] == pluginIDFlagName && + ((inputSplit[len(inputSplit)-1] == pluginIDFlagName && d.GetWordBeforeCursor() == "") || + (inputSplit[len(inputSplit)-2] == pluginIDFlagName && d.GetWordBeforeCursor() != "")) { return c.updateSuggestionsThroughFunc(d, getAvailablePlugins) } else { return cobraCommandCompletion(cmd, d, inputFlags, []prompt.Suggest{}) diff --git a/controller/interfaces/transport/transport.go b/controller/interfaces/transport/transport.go index b34823b744af02aaf52b0f970776033a97b76b0f..c9392787341fae1354b8bf1f6e45b1255519c837 100644 --- a/controller/interfaces/transport/transport.go +++ b/controller/interfaces/transport/transport.go @@ -14,7 +14,6 @@ import ( type Transport interface { Get(ctx context.Context, params ...string) (any, error) Set(ctx context.Context, payload change.Payload, path string, plugin plugin.Plugin) error - // TODO: add delete CustomSet(ctx context.Context, req *gpb.SetRequest) (*gpb.SetResponse, error) Subscribe(ctx context.Context, params ...string) error ControlPlaneSubscribe(ctx context.Context, subscribeCallbackFunc HandleSubscribeResponse, diff --git a/controller/mocks/NetworkElement.go b/controller/mocks/NetworkElement.go index 0786054216d21480e03ac3cf512260a20e6ea0f2..193cea4e13498053440188d300c724ae1068750c 100644 --- a/controller/mocks/NetworkElement.go +++ b/controller/mocks/NetworkElement.go @@ -13,8 +13,6 @@ import ( transport "code.fbi.h-da.de/danet/gosdn/controller/interfaces/transport" uuid "github.com/google/uuid" - - ygot "github.com/openconfig/ygot/ygot" ) // NetworkElement is an autogenerated mock type for the NetworkElement type @@ -186,11 +184,6 @@ func (_m *NetworkElement) ProcessResponse(_a0 protoreflect.ProtoMessage) error { return r0 } -// SetModel provides a mock function with given fields: _a0 -func (_m *NetworkElement) SetModel(_a0 ygot.GoStruct) { - _m.Called(_a0) -} - // Transport provides a mock function with given fields: func (_m *NetworkElement) Transport() transport.Transport { ret := _m.Called() diff --git a/controller/mocks/Plugin.go b/controller/mocks/Plugin.go index 91229e7327e6510a7548d4eaa37e62f1ec78173d..fe8817b993dc1e1746aeb60d896b5c625dbf74f7 100644 --- a/controller/mocks/Plugin.go +++ b/controller/mocks/Plugin.go @@ -179,6 +179,32 @@ func (_m *Plugin) Ping() error { return r0 } +// PruneConfigFalse provides a mock function with given fields: value +func (_m *Plugin) PruneConfigFalse(value []byte) ([]byte, error) { + ret := _m.Called(value) + + var r0 []byte + var r1 error + if rf, ok := ret.Get(0).(func([]byte) ([]byte, error)); ok { + return rf(value) + } + if rf, ok := ret.Get(0).(func([]byte) []byte); ok { + r0 = rf(value) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]byte) + } + } + + if rf, ok := ret.Get(1).(func([]byte) error); ok { + r1 = rf(value) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + // Restart provides a mock function with given fields: func (_m *Plugin) Restart() error { ret := _m.Called() diff --git a/controller/northbound/server/configurationmanagement.go b/controller/northbound/server/configurationmanagement.go index bf99180c706a4fac3c358dad26bfb005560f0df1..f6a86f4892c1db95ed062b39498a3ec384c566ca 100644 --- a/controller/northbound/server/configurationmanagement.go +++ b/controller/northbound/server/configurationmanagement.go @@ -80,15 +80,6 @@ func (c ConfigurationManagementServer) ExportSDNConfig(ctx context.Context, requ networkElements := pnd.NetworkElements() - // TODO: check if this is really necessary - //for _, networkElement := range networkElements { - // model, err := networkElement.GetModelAsFilteredCopy() - // if err != nil { - // return nil, err - // } - // //networkElement.SetModel(model) - //} - sdnConfig.NetworkElements = networkElements sdnConfig.Nodes, err = c.nodeService.GetAll() @@ -323,7 +314,8 @@ func (c ConfigurationManagementServer) createNetworkElements(sdnConfig *loadedSD TransportOption: &tpb.TransportOption_GnmiTransportOption{ GnmiTransportOption: &tpb.GnmiTransportOption{}, }, - // TODO: change TransportOption - type is not needed + // TODO: change TransportOption - type is not needed; this should + // be removed as soon as we remove the csbi device type Type: spb.Type_TYPE_OPENCONFIG, } _, err := pnd.AddNetworkElement( diff --git a/controller/nucleus/plugin.go b/controller/nucleus/plugin.go index faff75b29b7e09f19232127882c7028d32798684..27384db2a2e08023236d41d4a2ee8d341916b0c5 100644 --- a/controller/nucleus/plugin.go +++ b/controller/nucleus/plugin.go @@ -164,7 +164,6 @@ func (p *Plugin) Ping() error { // UpdatePlugin updates a given Plugin. Therefore the version of the // `plugin.yml` manifest file is compared to the version in use. If a new // version is within the plugin folder, the new version of the plugin is built. -// NOTE:This should only be used with caution. func UpdatePlugin(p plugin.Plugin) (updated bool, err error) { return false, fmt.Errorf("not implemented yet") }