diff --git a/README.md b/README.md
index 9ae2bb61f864c4628a149bb02628fc3154ea475b..0e3cb09fe334060e1bcdcf95e14ba4492f5f9c95 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# goSDN [](https://code.fbi.h-da.de/cocsn/gosdn/-/commits/master) [](https://code.fbi.h-da.de/cocsn/gosdn/-/commits/master)
+# goSDN [](https://code.fbi.h-da.de/danet/gosdn/-/commits/master) [](https://code.fbi.h-da.de/danet/gosdn/-/commits/master)
`goSDN` is a prototypical approach to build a model driven multi-vendor SDN controller.
@@ -42,7 +42,7 @@ You can install the latest release of `goSDN` locally using the `go get` command
```sh
> git config --global url."git@code.fbi.h-da.de:".insteadOf "https://code.fbi.h-da.de"
> go env -w GOPRIVATE=code.fbi.h-da.de/cocsn/*
-> go get code.fbi.h-da.de/cocsn/gosdn/cmd/gosdn
+> go get code.fbi.h-da.de/danet/gosdn/cmd/gosdn
```
To install the development version you need to clone the repo and use `go install` to build and install the binary:
@@ -54,7 +54,7 @@ To install the development version you need to clone the repo and use `go instal
> git clone git@code.fbi.h-da.de:cocsn/gosdn.git
# checkout the develop branch (or any other branch)
-> cd $GOPATH/src/code.fbi.h-da.de/cocsn/gosdn
+> cd $GOPATH/src/code.fbi.h-da.de/danet/gosdn
> git checkout develop
> go install ./cmd/gosdn
```
@@ -64,7 +64,7 @@ Now you can start `goSDN` locally using the `gosdn` command or [use the CLI](#us
# Getting Started
## k8s
-We have an instance of `goSDN` for each the latest master and current develop branch running on the department's k8s cluster. These endpoints can be accessed using the `gosdn cli` command. If anything breaks please file an [issue](https://code.fbi.h-da.de/cocsn/gosdn/-/issues/new).
+We have an instance of `goSDN` for each the latest master and current develop branch running on the department's k8s cluster. These endpoints can be accessed using the `gosdn cli` command. If anything breaks please file an [issue](https://code.fbi.h-da.de/danet/gosdn/-/issues/new).
## Using the CLI
@@ -78,5 +78,5 @@ The `gosdn cli` command allows you to interact with a running `goSDN` controller
| Master | Develop |
| ------ | ------ |
-| [](https://code.fbi.h-da.de/cocsn/gosdn/-/commits/master) | [](https://code.fbi.h-da.de/cocsn/gosdn/-/commits/develop) |
-| [](https://code.fbi.h-da.de/cocsn/gosdn/-/commits/master) | [](https://code.fbi.h-da.de/cocsn/gosdn/-/commits/develop) |
+| [](https://code.fbi.h-da.de/danet/gosdn/-/commits/master) | [](https://code.fbi.h-da.de/danet/gosdn/-/commits/develop) |
+| [](https://code.fbi.h-da.de/danet/gosdn/-/commits/master) | [](https://code.fbi.h-da.de/danet/gosdn/-/commits/develop) |
diff --git a/api/apiIntegration_test.go b/api/apiIntegration_test.go
index ac9b296253f664b0b8546ddaa72a753b570ccd04..a7b7460ab1130631f46de56af1a25c0886447dd5 100644
--- a/api/apiIntegration_test.go
+++ b/api/apiIntegration_test.go
@@ -3,8 +3,8 @@ package api
import (
"testing"
- "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
"github.com/google/uuid"
guuid "github.com/google/uuid"
"github.com/spf13/viper"
diff --git a/api/api_test.go b/api/api_test.go
index 76bd952b3b631b1d5bcb895c5f00f47d5037599d..a55113c1a25364a28e251e9fd200cecf408dafce 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -3,10 +3,10 @@ package api
import (
"testing"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
)
diff --git a/api/grpc.go b/api/grpc.go
index f820f4ccfdae3188f30cd06f7446c11c4dadcb9e..74cdfd6014d34f5c65650cfd46090217e932945e 100644
--- a/api/grpc.go
+++ b/api/grpc.go
@@ -5,11 +5,11 @@ import (
"errors"
"time"
- pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/client"
+ pb "code.fbi.h-da.de/danet/api/go/gosdn/core"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ nbi "code.fbi.h-da.de/danet/gosdn/northbound/client"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
diff --git a/api/initialise_test.go b/api/initialise_test.go
index 39fd31483246ca8a7b54f58f2f5237ed99061290..bbac6dad0f48872079d548671b9a52e8bbe5ed0a 100644
--- a/api/initialise_test.go
+++ b/api/initialise_test.go
@@ -7,14 +7,14 @@ import (
"testing"
"time"
- cpb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/mocks"
- nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/server"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ cpb "code.fbi.h-da.de/danet/api/go/gosdn/core"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/mocks"
+ nbi "code.fbi.h-da.de/danet/gosdn/northbound/server"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/util/proto"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/mock"
diff --git a/api/pnd.go b/api/pnd.go
index fb6203ba995df495fe5b3cc2fd456009d56bf844..c5ce3f2ccee31b39f0e49990612fad00f912b822 100644
--- a/api/pnd.go
+++ b/api/pnd.go
@@ -1,14 +1,14 @@
package api
import (
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/networkdomain"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/networkdomain"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/store"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"google.golang.org/protobuf/proto"
diff --git a/api/pnd_test.go b/api/pnd_test.go
index 1e11ec1c703832ae737c1d322ec0d47978e35d3a..62beb9281875b6ef5a3d3c68eb8e2dbc3ec2005c 100644
--- a/api/pnd_test.go
+++ b/api/pnd_test.go
@@ -4,13 +4,13 @@ import (
"reflect"
"testing"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/networkdomain"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/networkdomain"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/store"
"github.com/google/uuid"
)
diff --git a/build/cd/deploy.go b/build/cd/deploy.go
index f708847243c4a52f873d7984b4d2b417f2d0dfad..eb6a0033a1914a0f6a978e5bcab7e3b0f9b3d7ff 100644
--- a/build/cd/deploy.go
+++ b/build/cd/deploy.go
@@ -5,7 +5,7 @@ import (
"os"
"strconv"
- nucleus "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ nucleus "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
appv1 "k8s.io/api/apps/v1"
@@ -305,7 +305,7 @@ func createDeployment(environment, hash string) *appv1.Deployment {
Containers: []corev1.Container{
{
Name: "gosdn",
- Image: "registry.code.fbi.h-da.de/cocsn/gosdn:" + hash,
+ Image: "registry.code.fbi.h-da.de/danet/gosdn:" + hash,
Command: nil,
Args: nil,
WorkingDir: "",
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index 2fe12d7f24f18a29dd9cd46ed438d182add45bc5..e1e6107d56fe9a6a1f14491641da3bfd9a72f83a 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -39,5 +39,5 @@ build-docker:
- docker push $DOCKER_IMAGE_SHA
- docker tag $DOCKER_IMAGE_SHA $TAG
- docker push $TAG
- - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID} .
- - docker push registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
+ - docker build --target installer --build-arg GITLAB_USER=$GO_MODULES_USER --build-arg GITLAB_TOKEN=$GO_MODULES_ACCESS_TOKEN --build-arg BUILDARGS=$BUILDARGS -t ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID} .
+ - docker push ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID}
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index 106d29b7893283c1d9751fd7c1aad12c7bf999c0..27da996575feee87b94af17606b4bee2d435c7d8 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -1,5 +1,5 @@
.integration-test: &integration-test
- image: registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
+ image: ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID}
stage: integration-test
needs:
- job: "containerlab:deploy"
@@ -34,7 +34,7 @@ integration-test:api:
- go test -race -v -run TestApiIntegration
.test: &test
- image: registry.code.fbi.h-da.de/cocsn/gosdn:testing_${CI_PIPELINE_ID}
+ image: ${CI_REGISTRY_IMAGE}:testing_${CI_PIPELINE_ID}
stage: test
allow_failure: true
variables:
@@ -49,7 +49,7 @@ integration-test:api:
unit-test:
script:
- - go test -short -race $(go list ./... | grep -v /forks/ | grep -v /api/ | grep -v /mocks ) -v -coverprofile=coverage.out
+ - go test -short -race $(go list ./... | grep -v /forks/ | grep -v /mocks ) -v -coverprofile=coverage.out
after_script:
- go tool cover -func=coverage.out
<<: *test
diff --git a/cmd/gosdn/main.go b/cmd/gosdn/main.go
index a87c9ff0e98464b7a0c8b1ede5808946d954ca4a..3298b8935b44f844c1c2b32b1ebd0232d19e9430 100644
--- a/cmd/gosdn/main.go
+++ b/cmd/gosdn/main.go
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
*/
package main
-import "code.fbi.h-da.de/cocsn/gosdn/cmd"
+import "code.fbi.h-da.de/danet/gosdn/cmd"
func main() {
cmd.Execute()
diff --git a/cmd/root.go b/cmd/root.go
index ec5fa3df13acc43d2e05ce6a07e4cb52e049d4d8..e7465b44fec469a0775c8437e31a6efc8aaa7713 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -35,7 +35,7 @@ import (
"context"
"os"
- "code.fbi.h-da.de/cocsn/gosdn"
+ "code.fbi.h-da.de/danet/gosdn"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
diff --git a/controller.go b/controller.go
index 3f80002be18899d67c0b1b13cec6c8f03ac80b4f..a4c1b4f77ab098a7d1377a2233765dd03a4a2632 100644
--- a/controller.go
+++ b/controller.go
@@ -14,15 +14,14 @@ import (
"github.com/spf13/viper"
"google.golang.org/grpc"
- pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
- cpb "code.fbi.h-da.de/cocsn/api/go/gosdn/csbi"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- nbi "code.fbi.h-da.de/cocsn/gosdn/northbound/server"
-
- "code.fbi.h-da.de/cocsn/gosdn/database"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ pb "code.fbi.h-da.de/danet/api/go/gosdn/core"
+ cpb "code.fbi.h-da.de/danet/api/go/gosdn/csbi"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ nbi "code.fbi.h-da.de/danet/gosdn/northbound/server"
+
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
)
var coreLock sync.RWMutex
@@ -30,9 +29,6 @@ var coreOnce sync.Once
// Core is the representation of the controller's core
type Core struct {
- // deprecated
- database database.Database
-
pndc *nucleus.PndStore
httpServer *http.Server
grpcServer *grpc.Server
@@ -46,7 +42,6 @@ var c *Core
func init() {
c = &Core{
- database: database.Database{},
pndc: nucleus.NewPndStore(),
stopChan: make(chan os.Signal, 1),
}
diff --git a/database/client.go b/database/client.go
deleted file mode 100644
index 86dbdb186b2114a590d74cfa26d2e99ff19990e9..0000000000000000000000000000000000000000
--- a/database/client.go
+++ /dev/null
@@ -1,360 +0,0 @@
-package database
-
-import (
- "errors"
-
- "github.com/neo4j/neo4j-go-driver/neo4j"
- log "github.com/sirupsen/logrus"
- "github.com/spf13/viper"
-)
-
-// Database is a database
-// deprecated
-type Database struct {
- driver neo4j.Driver
-}
-
-// PND is a principle network domain
-type PND struct {
- name string
- description string
- interfaces []string
-}
-
-// NewDatabaseClient creates a database ciena
-func NewDatabaseClient() Database {
- uri := viper.GetString("db.socket")
- username := viper.GetString("db.user")
- password := viper.GetString("db.password")
- encrypted := viper.GetBool("db.crypto")
- driver := createDriver(uri, username, password, encrypted)
-
- return Database{
- driver: driver,
- }
-}
-
-// createDriver creates a neo4j.Driver instance
-func createDriver(uri, username, password string, encrypted bool) neo4j.Driver {
- driver, err := neo4j.NewDriver(
- uri,
- neo4j.BasicAuth(username, password, ""),
- func(c *neo4j.Config) {
- c.Encrypted = encrypted
- },
- )
-
- if err != nil {
- log.Info("failed creating database driver:", err)
- }
-
- return driver
-}
-
-// createSession creates a neo4j.Session
-func createSession(driver neo4j.Driver, write bool) neo4j.Session {
- var sessionConfig neo4j.SessionConfig
-
- if write {
- sessionConfig = neo4j.SessionConfig{AccessMode: neo4j.AccessModeWrite}
- } else {
- sessionConfig = neo4j.SessionConfig{AccessMode: neo4j.AccessModeRead}
- }
-
- session, err := driver.NewSession(sessionConfig)
-
- if err != nil {
- log.Info(err)
- }
-
- return session
-}
-
-// storePndTxFunc transaction to store a pnd in the database
-func storePndTxFunc(name, description string, interfaces []string) neo4j.TransactionWork {
- return func(tx neo4j.Transaction) (interface{}, error) {
- query :=
- `
- MERGE (pnd:PND {name: $name})
- ON CREATE SET pnd.description = $description,
- pnd.interfaces = $interfaces
- RETURN pnd
- `
-
- result, err := tx.Run(query, map[string]interface{}{
- "name": name,
- "description": description,
- "interfaces": interfaces,
- })
-
- if err != nil {
- //TODO: handle neo4j.isServiceUnavailable()
- return nil, err
- }
-
- if result.Next() {
- return result.Record().GetByIndex(0), nil
- }
-
- return nil, errors.New("expected a record")
- }
-}
-
-// StorePND stores the given principle network domain
-func (d Database) StorePND(pnd *PND) neo4j.Node {
- session := createSession(d.driver, true)
- defer session.Close()
-
- result, err := session.WriteTransaction(storePndTxFunc(pnd.name, pnd.description, pnd.interfaces))
- if err != nil {
- log.Info(err)
- }
-
- log.Info("created/updated PND with id: ", result.(neo4j.Node).Id())
- return result.(neo4j.Node)
-}
-
-//RemovePND removes the given principle network domain by id.
-func (d Database) RemovePND(id string) {}
-
-//GetPNDByID gets a specific PND by the given ID.
-func (d Database) GetPNDByID(id string) {}
-
-//GetNodesByLabel gets all nodes that belong to a specific label.
-func (d Database) GetNodesByLabel(label string) {}
-
-//GetNodeByID gets a specific node by ID.
-func (d Database) GetNodeByID(id string) {}
-
-//storeNodesTxFunc transaction to store devices from a json.
-//relates them to a specific pnd id.
-//returns a slice of added devices
-func storeNodesTxFunc(json string, id int64) neo4j.TransactionWork {
- return func(tx neo4j.Transaction) (interface{}, error) {
- var nodelist []neo4j.Node
- query :=
- `
- WITH apoc.convert.fromJsonMap($stringToAdd)
- AS value
- UNWIND value.data as d
- MERGE (device:Device {id: d.object_id})
- ON CREATE SET device.nativeName = d.object_data.` + "`tapi-object-data`.name[0].value," + `
- device.deviceType = d.object_data.` + "`tapi-object-data`.name[1].value," + `
- device.serialNumber = d.object_data.` + "`tapi-object-data`.name[2].value," + `
- device.softwareVersion = d.object_data.` + "`tapi-object-data`.name[3].value," + `
- device.` + "`operational-state` = d.object_data.`tapi-object-data`.`operational-state`" + `
- WITH device
- MATCH (pnd:PND)
- WHERE id(pnd) = $pnd
- MERGE (device)-[:BELONGS_TO]->(pnd)
- RETURN device
- `
-
- result, err := tx.Run(query, map[string]interface{}{
- "stringToAdd": json,
- "pnd": id,
- })
-
- if err != nil {
- //TODO: handle neo4j.isServiceUnavailable()
- return nil, err
- }
-
- for result.Next() {
- nodelist = append(nodelist, result.Record().GetByIndex(0).(neo4j.Node))
- }
-
- if err = result.Err(); err != nil {
- return nil, err
- }
-
- return nodelist, nil
- }
-}
-
-// StoreNodes stores the given nodes to the database and adds them to a
-// principle networt domain (PND). It is required for a node to belong to a PND.
-func (d Database) StoreNodes(json string) []neo4j.Node {
- //TODO: remove this after testing and add own gRPC call for it
- testPND := PND{name: "test_PND", description: "very interesting", interfaces: []string{"TAPI", "RESTCONF"}}
- pnd := d.StorePND(&testPND).Id()
-
- session := createSession(d.driver, true)
- defer session.Close()
-
- result, err := session.WriteTransaction(storeNodesTxFunc(json, pnd))
- if err != nil {
- log.Info(err)
- }
-
- log.Info("added/updated devices (count): ", len(result.([]neo4j.Node)))
- return result.([]neo4j.Node)
-}
-
-// RemoveNodes removes the given nodes and their relationships
-func (d Database) RemoveNodes(json string) {}
-
-// RemoveSingleNode removes the given node and their relationship by id.
-func (d Database) RemoveSingleNode(id string) {}
-
-// storeLinksTxFunc transaction to store links from a json.
-// creates relation between different devices.
-// returns a slice of those created relations.
-func storeLinksTxFunc(json string) neo4j.TransactionWork {
- return func(tx neo4j.Transaction) (interface{}, error) {
- var relationsList []neo4j.Relationship
- query :=
- `
- WITH apoc.convert.fromJsonMap($stringToAdd)
- AS value
- UNWIND value.data as l
- MATCH (d:Device), (d2:Device)
- WHERE d.id = l.object_data.` + "`tapi-object-data`.`node-edge-point`[0].`node-uuid`" + `
- AND d2.id = l.object_data.` + "`tapi-object-data`.`node-edge-point`[1].`node-uuid`" + `
- CALL apoc.merge.relationship(d,l.object_data.` + "`tapi-object-data`.`layer-qualifier`,{},{}, d2,{})" + `
- YIELD rel
- RETURN rel
- `
-
- result, err := tx.Run(query, map[string]interface{}{
- "stringToAdd": json,
- })
-
- if err != nil {
- //TODO: handle neo4j.isServiceUnavailable()
- return nil, err
- }
-
- for result.Next() {
- relationsList = append(relationsList, result.Record().GetByIndex(0).(neo4j.Relationship))
- }
-
- if err = result.Err(); err != nil {
- return nil, err
- }
-
- return relationsList, nil
- }
-}
-
-// StoreLinks stores the links between nodes
-func (d Database) StoreLinks(json string) []neo4j.Relationship {
- session := createSession(d.driver, true)
- defer session.Close()
-
- result, err := session.WriteTransaction(storeLinksTxFunc(json))
- if err != nil {
- log.Info(err)
- }
-
- log.Info("added/updated links (count): ", len(result.([]neo4j.Relationship)))
-
- return result.([]neo4j.Relationship)
-}
-
-// storeNodeEdgePointsTxFunc transaction to store interfaces from a json.
-// returns count of added/updated interfaces
-func storeNodeEdgePointsTxFunc(json string) neo4j.TransactionWork {
- return func(tx neo4j.Transaction) (interface{}, error) {
- query :=
- `
- WITH apoc.convert.fromJsonMap($stringToAdd)
- AS value
- UNWIND value.data as i
- MERGE (interface:Interface {id: i.object_id})
- ON CREATE SET interface.object_type =i.object_type,
- interface.localId = i.object_data.` + "`tapi-object-data`.name[0].value," + `
- interface.location = i.object_data.` + "`tapi-object-data`.name[1].value," + `
- interface.` + "`containing-node` = i.object_data.`tapi-object-data`.`containing-node`" + `
- RETURN count(interface)
- `
-
- result, err := tx.Run(query, map[string]interface{}{
- "stringToAdd": json,
- })
-
- if err != nil {
- //TODO: handle neo4j.isServiceUnavailable()
- return nil, err
- }
-
- if result.Next() {
- return result.Record().GetByIndex(0), nil
- }
-
- return nil, errors.New("expected a record")
- }
-}
-
-//TODO: currently this goes over each and every device/interface and adds
-// a interface_of relation. -> do it only for the newly added interfaces
-
-// storeNodeEdgePointsRelationTxFunc transaction to create relations between interfaces and devices
-// returns count of added/updated relations
-func storeNodeEdgePointsRelationTxFunc() neo4j.TransactionWork {
- return func(tx neo4j.Transaction) (interface{}, error) {
- query :=
- `
- MATCH (d:Device), (i:Interface)
- WHERE d.id = i.` + "`containing-node`" + `
- MERGE (i)-[r:INTERFACE_OF]->(d)
- RETURN count(r)
- `
-
- result, err := tx.Run(query, nil)
-
- if err != nil {
- //TODO: handle neo4j.isServiceUnavailable()
- return nil, err
- }
-
- if result.Next() {
- return result.Record().GetByIndex(0), nil
- }
-
- return nil, errors.New("expected a record")
- }
-}
-
-// StoreNodeEdgePoints stores the given node edge points (interfaces)
-func (d Database) StoreNodeEdgePoints(json string) {
- session := createSession(d.driver, true)
- defer session.Close()
-
- result, err := session.WriteTransaction(storeNodeEdgePointsTxFunc(json))
- if err != nil {
- log.Info(err)
- }
-
- _, err = session.WriteTransaction(storeNodeEdgePointsRelationTxFunc())
- if err != nil {
- log.Info(err)
- }
-
- log.Info("added/updated nodeEdgePoints (count): ", result)
-}
-
-// StoreConnections stores relations between nodes
-func (d Database) StoreConnections(json string) {}
-
-// StoreTopology creates a new network topology node. Can also create a relation
-//the new node and a existing one if desired
-func StoreTopology() {}
-
-// RemoveTopology removes the given network topology. This includes the node itself
-//aswell as the containing links and relations
-func RemoveTopology() {}
-
-// CreateTopologyRelation creates a relation between two given topologies
-func CreateTopologyRelation() {}
-
-// CreateLink creates a link between two network elements
-func CreateLink() {}
-
-// RemoveLink removes a link between two network elements
-func RemoveLink() {}
-
-// Shutdown closes the connection to the database
-func (d Database) Shutdown() error {
- return d.driver.Close()
-}
diff --git a/go.mod b/go.mod
index a08af136b5f58a1b4abcc8c26f6465b851558df0..46040747cab4d3c0dd68c3d3869f75af78481ba6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,10 @@
-module code.fbi.h-da.de/cocsn/gosdn
+module code.fbi.h-da.de/danet/gosdn
go 1.16
require (
- code.fbi.h-da.de/cocsn/api v0.2.3
- code.fbi.h-da.de/cocsn/yang-models v0.0.7
+ code.fbi.h-da.de/danet/api v0.2.4
+ code.fbi.h-da.de/danet/yang-models v0.0.8
github.com/aristanetworks/goarista v0.0.0-20201120222254-94a892eb0c6a
github.com/docker/docker v20.10.6+incompatible
github.com/golang/protobuf v1.5.2
diff --git a/go.sum b/go.sum
index 5ef6055e5ebd8c702b23cce100414d576e0b1830..6990b07c92c14f3303c116acc4905e15b96acf9d 100644
--- a/go.sum
+++ b/go.sum
@@ -21,10 +21,10 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-code.fbi.h-da.de/cocsn/api v0.2.3 h1:zyXVU2yuRuS5a+UMGUj8eT86E+sxw15NHtFN9tjXfCk=
-code.fbi.h-da.de/cocsn/api v0.2.3/go.mod h1:s+P4Lrxl5rHyo/Q0UTABZrDfH4zuAoRKdzktlL0UsRI=
-code.fbi.h-da.de/cocsn/yang-models v0.0.7 h1:3TOo8J+EdAJKeq4o3aaNWZRhjSwguIS8wciW1U9PkSk=
-code.fbi.h-da.de/cocsn/yang-models v0.0.7/go.mod h1:M+2HinfhTT8nA8qvn2cpWNlOtuiizTNDWA3yfy72K/g=
+code.fbi.h-da.de/danet/api v0.2.4 h1:0fQJ1HEib3auseRxmtL03taBsjqjhmXnQNIm+w05FwY=
+code.fbi.h-da.de/danet/api v0.2.4/go.mod h1:kjazkgCFLje+z4BBNBLlyozhQUnkJd0sqlZz1Axe0wM=
+code.fbi.h-da.de/danet/yang-models v0.0.8 h1:LuKt58Zh2mDkQa9s4hFaIANtZLxES7EFX1rIczD0GDs=
+code.fbi.h-da.de/danet/yang-models v0.0.8/go.mod h1:aoz0hgHZoEm2Apu9kA93g9nIBjAApBvx4pMFj2gbx9g=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
diff --git a/interfaces/change/change.go b/interfaces/change/change.go
index 28b15cbe8be4bbb43959eb1a134e3670c9406f35..460a1af047a5eb56534fc3cffcc901aaddbe44ec 100644
--- a/interfaces/change/change.go
+++ b/interfaces/change/change.go
@@ -3,7 +3,7 @@ package change
import (
"time"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
)
diff --git a/interfaces/device/device.go b/interfaces/device/device.go
index ca233d357a2fa26688eb2e63f1ee7b6213ccbea0..1775d27b0117bfb8e7918ed47363168586b55aed 100644
--- a/interfaces/device/device.go
+++ b/interfaces/device/device.go
@@ -1,8 +1,8 @@
package device
import (
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/transport"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
"google.golang.org/protobuf/proto"
diff --git a/interfaces/networkdomain/pnd.go b/interfaces/networkdomain/pnd.go
index 6438f192e6f6189612743931a7acacee7e128b17..c6942f25492e6df4d998ba8384f4fb6e40d35d0a 100644
--- a/interfaces/networkdomain/pnd.go
+++ b/interfaces/networkdomain/pnd.go
@@ -1,12 +1,12 @@
package networkdomain
import (
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/store"
"github.com/google/uuid"
"google.golang.org/protobuf/proto"
)
diff --git a/interfaces/southbound/sbi.go b/interfaces/southbound/sbi.go
index 800d1a1f4c8b1b3a4dffea33b9bd745a27ec485c..eaacad5b544c4330041d25ed865a111db52bcc2f 100644
--- a/interfaces/southbound/sbi.go
+++ b/interfaces/southbound/sbi.go
@@ -1,7 +1,7 @@
package southbound
import (
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
"github.com/openconfig/ygot/ygot"
"github.com/google/uuid"
diff --git a/interfaces/transport/transport.go b/interfaces/transport/transport.go
index 280233b67cc25a8714d4fec24331891c204ee9f0..24f33f65a51306fd6301a75075a25494c224d572 100644
--- a/interfaces/transport/transport.go
+++ b/interfaces/transport/transport.go
@@ -3,7 +3,7 @@ package transport
import (
"context"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
"github.com/openconfig/ygot/ytypes"
)
diff --git a/mocks/Change.go b/mocks/Change.go
index 945413247293aa4e2d6aba02b6cca46b9a0024f3..a77d75992fcb55bdce1a440a4a80513fa33dc2da 100644
--- a/mocks/Change.go
+++ b/mocks/Change.go
@@ -3,7 +3,7 @@
package mocks
import (
- pnd "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ pnd "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
mock "github.com/stretchr/testify/mock"
time "time"
diff --git a/mocks/Device.go b/mocks/Device.go
index f3e7d900d1dcda30c253341be4f48517b1b00c41..9893daacab14ba16072a3355c3b1187f7d382222 100644
--- a/mocks/Device.go
+++ b/mocks/Device.go
@@ -3,11 +3,11 @@
package mocks
import (
- southbound "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
+ southbound "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
mock "github.com/stretchr/testify/mock"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- transport "code.fbi.h-da.de/cocsn/gosdn/interfaces/transport"
+ transport "code.fbi.h-da.de/danet/gosdn/interfaces/transport"
uuid "github.com/google/uuid"
diff --git a/mocks/NetworkDomain.go b/mocks/NetworkDomain.go
index 6d29a808f7463e9ccfbc6bbf453da8e7a03339dd..02b8bd8fd599153fe8d508f21dbd12d102bbbd32 100644
--- a/mocks/NetworkDomain.go
+++ b/mocks/NetworkDomain.go
@@ -3,20 +3,20 @@
package mocks
import (
- change "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
- device "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
+ change "code.fbi.h-da.de/danet/gosdn/interfaces/change"
+ device "code.fbi.h-da.de/danet/gosdn/interfaces/device"
mock "github.com/stretchr/testify/mock"
- pnd "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ pnd "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
- southbound "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
+ southbound "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
- store "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
+ store "code.fbi.h-da.de/danet/gosdn/interfaces/store"
- transport "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ transport "code.fbi.h-da.de/danet/api/go/gosdn/transport"
uuid "github.com/google/uuid"
)
diff --git a/mocks/SouthboundInterface.go b/mocks/SouthboundInterface.go
index 3528d150a28e19fc062e9d80e8d4439249980c61..0a530bcee437e67e47a5dbcff7d84e0e5f43acfa 100644
--- a/mocks/SouthboundInterface.go
+++ b/mocks/SouthboundInterface.go
@@ -3,7 +3,7 @@
package mocks
import (
- gosdnsouthbound "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ gosdnsouthbound "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
gnmi "github.com/openconfig/gnmi/proto/gnmi"
mock "github.com/stretchr/testify/mock"
diff --git a/mocks/Store.go b/mocks/Store.go
index d964f824e8d29aa7d851e7553bcaaf0804167a13..dcfd7d4675de24ac5cb033d906ba93b7c331a9be 100644
--- a/mocks/Store.go
+++ b/mocks/Store.go
@@ -3,7 +3,7 @@
package mocks
import (
- store "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
+ store "code.fbi.h-da.de/danet/gosdn/interfaces/store"
uuid "github.com/google/uuid"
mock "github.com/stretchr/testify/mock"
)
diff --git a/mocks/Transport.go b/mocks/Transport.go
index 0651c3872fe103856d439b68be58e6552977be53..06d9676057391d1ad89d18ded641bc6182aca2bc 100644
--- a/mocks/Transport.go
+++ b/mocks/Transport.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- change "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
+ change "code.fbi.h-da.de/danet/gosdn/interfaces/change"
mock "github.com/stretchr/testify/mock"
diff --git a/northbound/client/core.go b/northbound/client/core.go
index 2e5278923214769c5c5b4adf43dfdf07f50a251d..9f98060bc0dd47a83b9051dab35cb70202810f4d 100644
--- a/northbound/client/core.go
+++ b/northbound/client/core.go
@@ -1,7 +1,7 @@
package client
import (
- pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+ pb "code.fbi.h-da.de/danet/api/go/gosdn/core"
"google.golang.org/grpc"
)
diff --git a/northbound/client/pnd.go b/northbound/client/pnd.go
index f5ca9101611758b7c30704f501aa1ed84aeaa9ac..2e369982816965d4a4bfb8c97f4b3da527eae406 100644
--- a/northbound/client/pnd.go
+++ b/northbound/client/pnd.go
@@ -1,7 +1,7 @@
package client
import (
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
"google.golang.org/grpc"
)
diff --git a/northbound/server/core.go b/northbound/server/core.go
index 30c44aafcaca14b59590e7c7bcf4e6ee944e03da..b0b449fb402c9a7dcbe0b656cb244a04f9375194 100644
--- a/northbound/server/core.go
+++ b/northbound/server/core.go
@@ -4,10 +4,10 @@ import (
"context"
"time"
- pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ pb "code.fbi.h-da.de/danet/api/go/gosdn/core"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
"github.com/google/uuid"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/northbound/server/core_test.go b/northbound/server/core_test.go
index 3240fbb3c39808819ef57529b4bec4b934ce20af..19bcb0acb578f49beafc3cd405f495d27112f4ac 100644
--- a/northbound/server/core_test.go
+++ b/northbound/server/core_test.go
@@ -5,7 +5,7 @@ import (
"reflect"
"testing"
- pb "code.fbi.h-da.de/cocsn/api/go/gosdn/core"
+ pb "code.fbi.h-da.de/danet/api/go/gosdn/core"
)
func Test_core_Set(t *testing.T) {
diff --git a/northbound/server/csbi.go b/northbound/server/csbi.go
index 85e3dd926d9437f6261e8c8a57ea78e5ab6f66f0..975e3ea225fa6c9c699ac7664a64b050b40d0b9d 100644
--- a/northbound/server/csbi.go
+++ b/northbound/server/csbi.go
@@ -6,8 +6,8 @@ import (
log "github.com/sirupsen/logrus"
- cpb "code.fbi.h-da.de/cocsn/api/go/gosdn/csbi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ cpb "code.fbi.h-da.de/danet/api/go/gosdn/csbi"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
diff --git a/northbound/server/nbi.go b/northbound/server/nbi.go
index eae15ec9f7cdb7613a88b1103fd03aa8ee2a2150..e99888d64cf7bd7dc74dc3e2109711544d0b89fb 100644
--- a/northbound/server/nbi.go
+++ b/northbound/server/nbi.go
@@ -1,7 +1,7 @@
package server
import (
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
)
var pndc *nucleus.PndStore
diff --git a/northbound/server/pnd.go b/northbound/server/pnd.go
index 897102483d8e6fce670caba84f2bdd93c59b4a7e..46f4505e5ceefab4c9df7730d40f713e3435cca4 100644
--- a/northbound/server/pnd.go
+++ b/northbound/server/pnd.go
@@ -8,11 +8,11 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/networkdomain"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/networkdomain"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
log "github.com/sirupsen/logrus"
@@ -211,11 +211,14 @@ func fillOnds(pnd networkdomain.NetworkDomain, all bool, did ...string) ([]*ppb.
var ondList []uuid.UUID
var onds []*ppb.OrchestratedNetworkingDevice
- // all decides if a client wants all devices or only a single one
+ // all indicates if a client wants all devices or only a single one
switch all {
case true:
ondList = pnd.Devices()
onds = make([]*ppb.OrchestratedNetworkingDevice, len(ondList))
+ for _, id := range ondList {
+ did = append(did, id.String())
+ }
default:
if len(did) == 0 {
err := &errors.ErrInvalidParameters{
diff --git a/northbound/server/pnd_test.go b/northbound/server/pnd_test.go
index 83ca057c7d0127e0e2cb434dc7866c0e2dc3683b..541f29260cccfe81b6c4c4786da5c0e1e5322af5 100644
--- a/northbound/server/pnd_test.go
+++ b/northbound/server/pnd_test.go
@@ -7,13 +7,13 @@ import (
"testing"
"time"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/mocks"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/mocks"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/mock"
@@ -139,6 +139,10 @@ func Test_pnd_Get(t *testing.T) {
p := pndServer{
UnimplementedPndServer: ppb.UnimplementedPndServer{},
}
+ if err := pndc.Add(mockDevice); err != nil {
+ t.Error(err)
+ return
+ }
resp, err := p.Get(tt.args.ctx, tt.args.request)
if (err != nil) != tt.wantErr {
t.Errorf("Get() error = %v, wantErr %v", err, tt.wantErr)
diff --git a/nucleus/change.go b/nucleus/change.go
index 8bccf6deec1d88952bef7cdfc3aa7be0965b6e51..3fd4d7c0cb11b9166ab880eeebb83ff0ff977163 100644
--- a/nucleus/change.go
+++ b/nucleus/change.go
@@ -5,7 +5,7 @@ import (
"os"
"time"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
diff --git a/nucleus/change_test.go b/nucleus/change_test.go
index 3f16dd04a61b75b60c677d613dad4ec7e4fa7d31..fa4cf5b9c96da4a09a486ae00de080dfe8f90e04 100644
--- a/nucleus/change_test.go
+++ b/nucleus/change_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"time"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
"github.com/google/uuid"
"github.com/openconfig/ygot/exampleoc"
"github.com/openconfig/ygot/ygot"
diff --git a/nucleus/device.go b/nucleus/device.go
index d155b0c6ab1262a31ab3d8eb5134fdb6dcc73a32..02f21df206bfb520fece45dce45661b48a7e8b27 100644
--- a/nucleus/device.go
+++ b/nucleus/device.go
@@ -1,10 +1,10 @@
package nucleus
import (
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/transport"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/transport"
"github.com/docker/docker/pkg/namesgenerator"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
diff --git a/nucleus/device_test.go b/nucleus/device_test.go
index 9290231c1235bf8b05f0aac7ca5cd1145e87ebaa..30364ce4050f421656eec577c762d9972413dc5e 100644
--- a/nucleus/device_test.go
+++ b/nucleus/device_test.go
@@ -4,12 +4,12 @@ import (
"reflect"
"testing"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/transport"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
)
diff --git a/nucleus/gnmi_transport.go b/nucleus/gnmi_transport.go
index d8d9e60abdf6a20426bd6f61d824c468983e02a0..178f09d5db7fe2492f14cbf7a3fc7354ce4f4542 100644
--- a/nucleus/gnmi_transport.go
+++ b/nucleus/gnmi_transport.go
@@ -5,25 +5,25 @@ import (
"fmt"
"reflect"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
"google.golang.org/grpc"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
- pathutils "code.fbi.h-da.de/cocsn/gosdn/nucleus/util/path"
+ "code.fbi.h-da.de/danet/gosdn/forks/goarista/gnmi"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/types"
+ pathutils "code.fbi.h-da.de/danet/gosdn/nucleus/util/path"
gpb "github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/goyang/pkg/yang"
"github.com/openconfig/ygot/ygot"
"github.com/openconfig/ygot/ytypes"
log "github.com/sirupsen/logrus"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
)
// Gnmi implements the Transport interface and provides an SBI with the
diff --git a/nucleus/gnmi_transport_test.go b/nucleus/gnmi_transport_test.go
index 113570ad72e9e5ca5584421f41b76d401162e266..31ab5944bc32ae63da43f5e6df31cf12c34a24e0 100644
--- a/nucleus/gnmi_transport_test.go
+++ b/nucleus/gnmi_transport_test.go
@@ -6,16 +6,16 @@ import (
"reflect"
"testing"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/mocks"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ "code.fbi.h-da.de/danet/gosdn/forks/goarista/gnmi"
+ "code.fbi.h-da.de/danet/gosdn/mocks"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
gpb "github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/goyang/pkg/yang"
"github.com/openconfig/ygot/ytypes"
diff --git a/nucleus/initialise_test.go b/nucleus/initialise_test.go
index ed715276991df0cb7602ffbd345d7189652b8972..2ec97153ed543fb080e8b1d838d55c9dacc77d56 100644
--- a/nucleus/initialise_test.go
+++ b/nucleus/initialise_test.go
@@ -5,14 +5,14 @@ import (
"os"
"testing"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/mocks"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
- "code.fbi.h-da.de/cocsn/gosdn/test"
+ "code.fbi.h-da.de/danet/gosdn/forks/goarista/gnmi"
+ "code.fbi.h-da.de/danet/gosdn/mocks"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/util/proto"
+ "code.fbi.h-da.de/danet/gosdn/test"
"github.com/google/uuid"
gpb "github.com/openconfig/gnmi/proto/gnmi"
log "github.com/sirupsen/logrus"
diff --git a/nucleus/principalNetworkDomain.go b/nucleus/principalNetworkDomain.go
index 18b06083047476836375ee690fae350988fad3de..cf42d16c450a347b76e40b663486242936051621 100644
--- a/nucleus/principalNetworkDomain.go
+++ b/nucleus/principalNetworkDomain.go
@@ -5,20 +5,20 @@ import (
"encoding/json"
"time"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/types"
- cpb "code.fbi.h-da.de/cocsn/api/go/gosdn/csbi"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
+ cpb "code.fbi.h-da.de/danet/api/go/gosdn/csbi"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
"google.golang.org/protobuf/proto"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/networkdomain"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ "code.fbi.h-da.de/danet/gosdn/forks/goarista/gnmi"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/networkdomain"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/store"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
diff --git a/nucleus/principalNetworkDomain_test.go b/nucleus/principalNetworkDomain_test.go
index b273821a04c0dce6c6faab303064f12616d246c9..2c01bf1b917a53e7cf13492a7a03c90e5cb37154 100644
--- a/nucleus/principalNetworkDomain_test.go
+++ b/nucleus/principalNetworkDomain_test.go
@@ -5,14 +5,14 @@ import (
"reflect"
"testing"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/networkdomain"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/mocks"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/networkdomain"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/mocks"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
"github.com/google/uuid"
gpb "github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
diff --git a/nucleus/restconf_transport.go b/nucleus/restconf_transport.go
index 6d7237aaf9c0adb5a5451b67cdc6e26d9aacc1ad..06ae108a4332f8e349153cbe79d03b65f55c40f0 100644
--- a/nucleus/restconf_transport.go
+++ b/nucleus/restconf_transport.go
@@ -3,7 +3,7 @@ package nucleus
import (
"context"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
"github.com/openconfig/ygot/ytypes"
)
diff --git a/nucleus/southbound.go b/nucleus/southbound.go
index 290708e4bd321181e3ce4d9c07b02ca00012d90f..9de3b15fe408b8bd73173dda0c067b34a70accbf 100644
--- a/nucleus/southbound.go
+++ b/nucleus/southbound.go
@@ -4,12 +4,12 @@ import (
"fmt"
"reflect"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
"github.com/google/uuid"
gpb "github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/goyang/pkg/yang"
diff --git a/nucleus/southbound_test.go b/nucleus/southbound_test.go
index 7f05b2301879da14f3faceb7686f33608ecb37da..2f92d24a1d00d1663d0f86622a08c4773b366ebd 100644
--- a/nucleus/southbound_test.go
+++ b/nucleus/southbound_test.go
@@ -4,13 +4,13 @@ import (
"reflect"
"testing"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/transport"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/util/path"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/util/path"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/util/proto"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
"github.com/google/uuid"
gpb "github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/ygot/ygot"
diff --git a/nucleus/store.go b/nucleus/store.go
index 3742c1ea89495a061512b45d0d15498aba4484df..1d37668d72ca9e080609c3d840d2efc1150bbda5 100644
--- a/nucleus/store.go
+++ b/nucleus/store.go
@@ -5,13 +5,13 @@ import (
"reflect"
"sync"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/networkdomain"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/networkdomain"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/store"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
"github.com/google/uuid"
log "github.com/sirupsen/logrus"
diff --git a/nucleus/store_test.go b/nucleus/store_test.go
index 2e19b2ff2f30d995a789c735a5706f46577f3381..bc22db429bdf3b54da943b1ef5a1e66b24069a7d 100644
--- a/nucleus/store_test.go
+++ b/nucleus/store_test.go
@@ -5,15 +5,15 @@ import (
"sort"
"testing"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- "code.fbi.h-da.de/cocsn/yang-models/generated/openconfig"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ "code.fbi.h-da.de/danet/yang-models/generated/openconfig"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/device"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/networkdomain"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/store"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/device"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/networkdomain"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/store"
- "code.fbi.h-da.de/cocsn/gosdn/mocks"
+ "code.fbi.h-da.de/danet/gosdn/mocks"
"github.com/google/uuid"
"github.com/openconfig/ygot/ygot"
log "github.com/sirupsen/logrus"
diff --git a/nucleus/transport.go b/nucleus/transport.go
index f946dc332ddca903417f6f922635547e997074a1..abeeeca7476f63bdec1320877f0c2321ce010e24 100644
--- a/nucleus/transport.go
+++ b/nucleus/transport.go
@@ -1,10 +1,10 @@
package nucleus
import (
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/transport"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/transport"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
)
// NewTransport receives TransportOptions and returns an appropriate Transport
diff --git a/nucleus/transport_test.go b/nucleus/transport_test.go
index 5a6264c261065d043531897a6896eb76e6a18ab8..cb5a677cd326f3a7c93865c40d1aca3fe355d27e 100644
--- a/nucleus/transport_test.go
+++ b/nucleus/transport_test.go
@@ -3,8 +3,8 @@ package nucleus
import (
"testing"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/southbound"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
gpb "github.com/openconfig/gnmi/proto/gnmi"
)
diff --git a/nucleus/util/path/traverse_test.go b/nucleus/util/path/traverse_test.go
index bfffb9c058e93aa0e090746cc19a8baa066890c0..07ef89d4d31f9b0a1ff487cb9cd934033c609635 100644
--- a/nucleus/util/path/traverse_test.go
+++ b/nucleus/util/path/traverse_test.go
@@ -6,7 +6,7 @@ import (
"sort"
"testing"
- model "code.fbi.h-da.de/cocsn/gosdn/test/yang"
+ model "code.fbi.h-da.de/danet/gosdn/test/yang"
"github.com/openconfig/goyang/pkg/yang"
"github.com/openconfig/ygot/ytypes"
log "github.com/sirupsen/logrus"
diff --git a/test/integration/nucleusIntegration_test.go b/test/integration/nucleusIntegration_test.go
index 42aaa88e034f01e2bf353a216644be2da72c2776..07dee94cdcf64c5f913fb7567e949565d9d57f6d 100644
--- a/test/integration/nucleusIntegration_test.go
+++ b/test/integration/nucleusIntegration_test.go
@@ -9,16 +9,16 @@ import (
"testing"
"time"
- ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
- spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
- tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
- "code.fbi.h-da.de/cocsn/gosdn/interfaces/change"
+ ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
+ spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
+ tpb "code.fbi.h-da.de/danet/api/go/gosdn/transport"
+ "code.fbi.h-da.de/danet/gosdn/interfaces/change"
- "code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/errors"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/types"
- "code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
+ "code.fbi.h-da.de/danet/gosdn/forks/goarista/gnmi"
+ "code.fbi.h-da.de/danet/gosdn/nucleus"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/errors"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/types"
+ "code.fbi.h-da.de/danet/gosdn/nucleus/util/proto"
gpb "github.com/openconfig/gnmi/proto/gnmi"
log "github.com/sirupsen/logrus"
pb "google.golang.org/protobuf/proto"
diff --git a/test/targets.go b/test/targets.go
index 2471d5509c86157fcbf60b3669b0e7a9699b5012..d72882b4b9ca7719f36c5ae6caa69b67be3c7fab 100644
--- a/test/targets.go
+++ b/test/targets.go
@@ -4,8 +4,8 @@ import (
"net"
"reflect"
- "code.fbi.h-da.de/cocsn/gosdn/forks/google/gnmi"
- oc "code.fbi.h-da.de/cocsn/yang-models/generated/arista"
+ "code.fbi.h-da.de/danet/gosdn/forks/google/gnmi"
+ oc "code.fbi.h-da.de/danet/yang-models/generated/arista"
pb "github.com/openconfig/gnmi/proto/gnmi"
"github.com/openconfig/goyang/pkg/yang"
"github.com/openconfig/ygot/util"
diff --git a/test/terraform/variables.tf b/test/terraform/variables.tf
index 3eae3d9d717557d5657d509fd3939d48309b690c..88bd132cfd46fe5009e504bbdbbbe5455260ecaf 100644
--- a/test/terraform/variables.tf
+++ b/test/terraform/variables.tf
@@ -24,12 +24,12 @@ variable "tls_ca_cert" {
variable "container_tag" {
type = string
- default = "registry.code.fbi.h-da.de/cocsn/gosdn:latest"
+ default = "registry.code.fbi.h-da.de/danet/gosdn:latest"
}
variable "ceos_tag" {
type = string
- default = "registry.code.fbi.h-da.de/cocsn/gosdn/ceos:latest"
+ default = "registry.code.fbi.h-da.de/danet/gosdn/ceos:latest"
}
variable "network_name" {