From 9ce4b7ba4be369a381228152788b20e5ab8c3ba5 Mon Sep 17 00:00:00 2001
From: Malte Bauch <malte.bauch@stud.h-da.de>
Date: Mon, 20 Mar 2023 17:48:39 +0100
Subject: [PATCH] Remove `SetModel` for NetworkElement
---
.../networkelement/networkElement.go | 2 --
controller/nucleus/networkElement.go | 24 -------------------
2 files changed, 26 deletions(-)
diff --git a/controller/interfaces/networkelement/networkElement.go b/controller/interfaces/networkelement/networkElement.go
index c4a645a72..f2b2ea262 100644
--- a/controller/interfaces/networkelement/networkElement.go
+++ b/controller/interfaces/networkelement/networkElement.go
@@ -5,7 +5,6 @@ import (
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/plugin"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/transport"
"github.com/google/uuid"
- "github.com/openconfig/ygot/ygot"
"google.golang.org/protobuf/proto"
tpb "code.fbi.h-da.de/danet/gosdn/api/go/gosdn/transport"
@@ -18,7 +17,6 @@ type NetworkElement interface {
GetModel() ([]byte, error)
GetPlugin() plugin.Plugin
GetModelAsFilteredCopy() ([]byte, error)
- SetModel(ygot.GoStruct)
Transport() transport.Transport
Name() string
ProcessResponse(proto.Message) error
diff --git a/controller/nucleus/networkElement.go b/controller/nucleus/networkElement.go
index 5f1d719b4..81250efd4 100644
--- a/controller/nucleus/networkElement.go
+++ b/controller/nucleus/networkElement.go
@@ -11,7 +11,6 @@ import (
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/transport"
"github.com/docker/docker/pkg/namesgenerator"
"github.com/google/uuid"
- "github.com/openconfig/ygot/ygot"
"go.mongodb.org/mongo-driver/bson"
"google.golang.org/protobuf/proto"
)
@@ -97,12 +96,6 @@ func (n *CommonNetworkElement) GetModelAsFilteredCopy() ([]byte, error) {
return n.Plugin.Model(true)
}
-// SetModel sets the ygot representation of the Network Element.
-// TODO: check if needed; if this is the case, then extend plugin to provide this functionality.
-func (n *CommonNetworkElement) SetModel(model ygot.GoStruct) {
- //n.Model = model
-}
-
// Transport returns the Transport of the network element.
func (n *CommonNetworkElement) Transport() transport.Transport {
return n.transport
@@ -173,12 +166,6 @@ func (n *CsbiNetworkElement) GetModelAsFilteredCopy() ([]byte, error) {
return n.Plugin.Model(true)
}
-// SetModel returns the ygot representation of the Network Element.
-// TODO: check if needed; if this is the case, then extend plugin to provide this functionality.
-func (n *CsbiNetworkElement) SetModel(model ygot.GoStruct) {
- //n.Model = model
-}
-
// Transport returns the Transport of the network element.
func (n *CsbiNetworkElement) Transport() transport.Transport {
return n.transport
@@ -329,14 +316,3 @@ func (d *CommonNetworkElement) GetModelAsString() (string, error) {
byteModel, err := d.Plugin.Model(false)
return string(byteModel), err
}
-
-//TODO: check if this can be removed
-//func (n *CommonNetworkElement) getYgotEmitJSONConfig() *ygot.EmitJSONConfig {
-// return &ygot.EmitJSONConfig{
-// Format: ygot.RFC7951,
-// Indent: "",
-// SkipValidation: true,
-// RFC7951Config: &ygot.RFC7951JSONConfig{
-// AppendModuleName: true,
-// }}
-//}
--
GitLab