Skip to content
This repository has been archived by the owner on May 27, 2022. It is now read-only.

Commit

Permalink
Merge pull request #201 from otcshare/openness_rel_2003_path_updates
Browse files Browse the repository at this point in the history
Openness rel 2003 path updates
  • Loading branch information
cjnolan authored Mar 31, 2020
2 parents b32b128 + daf8592 commit bff3781
Show file tree
Hide file tree
Showing 84 changed files with 197 additions and 197 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-License-Identifier: Apache-2.0
Copyright (c) 2019 Intel Corporation
```

For documentation please refer to https://github.com/otcshare/specs/blob/master/doc/getting-started/openness-experience-kits.md
For documentation please refer to https://github.com/open-ness/specs/blob/master/doc/getting-started/openness-experience-kits.md

6 changes: 3 additions & 3 deletions cmd/appliance/dataplane_cni.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
package main

import (
"github.com/otcshare/edgenode/pkg/eva"
"github.com/otcshare/edgenode/pkg/ela"
"github.com/otcshare/edgenode/pkg/service"
"github.com/open-ness/edgenode/pkg/eva"
"github.com/open-ness/edgenode/pkg/ela"
"github.com/open-ness/edgenode/pkg/service"
)

// EdgeServices array contains function pointers to services start functions
Expand Down
8 changes: 4 additions & 4 deletions cmd/appliance/dataplane_nts.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
package main

import (
"github.com/otcshare/edgenode/pkg/eda"
"github.com/otcshare/edgenode/pkg/ela"
"github.com/otcshare/edgenode/pkg/eva"
"github.com/otcshare/edgenode/pkg/service"
"github.com/open-ness/edgenode/pkg/eda"
"github.com/open-ness/edgenode/pkg/ela"
"github.com/open-ness/edgenode/pkg/eva"
"github.com/open-ness/edgenode/pkg/service"
)

// EdgeServices array contains function pointers to services start functions
Expand Down
4 changes: 2 additions & 2 deletions cmd/appliance/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"time"

"github.com/otcshare/edgenode/pkg/auth"
"github.com/otcshare/edgenode/pkg/service"
"github.com/open-ness/edgenode/pkg/auth"
"github.com/open-ness/edgenode/pkg/service"
)

const enrollBackoff = time.Second * 10
Expand Down
4 changes: 2 additions & 2 deletions cmd/eaa/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"

// Imports required to run agent
"github.com/otcshare/edgenode/pkg/eaa"
"github.com/otcshare/edgenode/pkg/service"
"github.com/open-ness/edgenode/pkg/eaa"
"github.com/open-ness/edgenode/pkg/service"
)

// EdgeServices array contains function pointers to services start functions
Expand Down
10 changes: 5 additions & 5 deletions cmd/edgednssvr/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"syscall"
"time"

logger "github.com/otcshare/common/log"
edgedns "github.com/otcshare/edgenode/pkg/edgedns"
"github.com/otcshare/edgenode/pkg/edgedns/grpc"
"github.com/otcshare/edgenode/pkg/edgedns/storage"
"github.com/otcshare/edgenode/pkg/util"
logger "github.com/open-ness/common/log"
edgedns "github.com/open-ness/edgenode/pkg/edgedns"
"github.com/open-ness/edgenode/pkg/edgedns/grpc"
"github.com/open-ness/edgenode/pkg/edgedns/storage"
"github.com/open-ness/edgenode/pkg/util"
)

var log = logger.DefaultLogger.WithField("main", nil)
Expand Down
2 changes: 1 addition & 1 deletion cmd/hddllog/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"syscall"
"time"

logger "github.com/otcshare/common/log"
logger "github.com/open-ness/common/log"
)

var log = logger.DefaultLogger.WithField("hddl", nil)
Expand Down
4 changes: 2 additions & 2 deletions cmd/interfaceservice/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"

// Imports required to run agent
"github.com/otcshare/edgenode/pkg/interfaceservice"
"github.com/otcshare/edgenode/pkg/service"
"github.com/open-ness/edgenode/pkg/interfaceservice"
"github.com/open-ness/edgenode/pkg/service"
)

// EdgeServices array contains function pointers to services start functions
Expand Down
4 changes: 2 additions & 2 deletions cmd/ovncni/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package main
// This CNI relies on a preconfigured OVN infrastructure.
// Prior to calling ADD request it is required to configure the logical OVN interface with appID used as its ID
// After calling DEL request it is required to remove the logical OVN interface with appID used as its ID
// "github.com/otcshare/edgenode/pkg/ovncni" package provides helper functions that could be used for creating
// "github.com/open-ness/edgenode/pkg/ovncni" package provides helper functions that could be used for creating
// and removing the port: CreatePort/DeletePort
//
// Currently this CNI has to be the first one in a chain
Expand Down Expand Up @@ -36,7 +36,7 @@ import (
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/version"
bv "github.com/containernetworking/plugins/pkg/utils/buildversion"
"github.com/otcshare/edgenode/pkg/ovncni"
"github.com/open-ness/edgenode/pkg/ovncni"
"github.com/pkg/errors"
)

Expand Down
10 changes: 5 additions & 5 deletions configs/appliance.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"ConnectionTimeout": "2s"
},
"Services": {
"github.com/otcshare/edgenode/pkg/eaa": "configs/eaa.json",
"github.com/otcshare/edgenode/pkg/ela": "configs/ela.json",
"github.com/otcshare/edgenode/pkg/eda": "configs/eda.json",
"github.com/otcshare/edgenode/pkg/eva": "configs/eva.json",
"github.com/otcshare/edgenode/pkg/interfaceservice": "configs/interfaceservice.json"
"github.com/open-ness/edgenode/pkg/eaa": "configs/eaa.json",
"github.com/open-ness/edgenode/pkg/ela": "configs/ela.json",
"github.com/open-ness/edgenode/pkg/eda": "configs/eda.json",
"github.com/open-ness/edgenode/pkg/eva": "configs/eva.json",
"github.com/open-ness/edgenode/pkg/interfaceservice": "configs/interfaceservice.json"
}
}
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
// Copyright (c) 2019-2020 Intel Corporation

module github.com/otcshare/edgenode
module github.com/open-ness/edgenode

require (
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
Expand All @@ -27,10 +27,10 @@ require (
github.com/miekg/dns v1.1.8
github.com/onsi/ginkgo v1.12.0
github.com/onsi/gomega v1.9.0
github.com/open-ness/common/log v0.0.0-20191220144925-273a86a3f0d0
github.com/open-ness/common/proxy v0.0.0-20191220144925-273a86a3f0d0
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/otcshare/common/log v0.0.0-20191204122953-5cc7dfd62d15
github.com/otcshare/common/proxy v0.0.0-20191204122953-5cc7dfd62d15
github.com/pkg/errors v0.8.1
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
Expand Down
10 changes: 5 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGV
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/open-ness/common/log v0.0.0-20191220141018-4ae2433f5586/go.mod h1:o1MWc+zXf+Yeo7LMIqa2w+Pu5YYHjyNqscNn9zT8ZPM=
github.com/open-ness/common/log v0.0.0-20191220144925-273a86a3f0d0 h1:n4XVXPR7q+5CIFwh6iYWl96N1EVDNulxy0DlVBa5AxE=
github.com/open-ness/common/log v0.0.0-20191220144925-273a86a3f0d0/go.mod h1:o1MWc+zXf+Yeo7LMIqa2w+Pu5YYHjyNqscNn9zT8ZPM=
github.com/open-ness/common/proxy v0.0.0-20191220144925-273a86a3f0d0 h1:kurlr+FPOl+kDYiO0oSZxB3NvJS2VAYI87fumdnEUQs=
github.com/open-ness/common/proxy v0.0.0-20191220144925-273a86a3f0d0/go.mod h1:5FBKzG8Knw789YP9hu+qw8Wi99c/xtdwFFY2a2/deeQ=
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/otcshare/common/log v0.0.0-20190926085025-d7b0a7a47249/go.mod h1:30kZGx52RercaMNsH35keYVwwh2KCNXBnXTAdm2XPfM=
github.com/otcshare/common/log v0.0.0-20191204122953-5cc7dfd62d15 h1:9+2MKzBkVtGuwJIdHogQ6lpOfu3aazyqc05JD5PmpPQ=
github.com/otcshare/common/log v0.0.0-20191204122953-5cc7dfd62d15/go.mod h1:30kZGx52RercaMNsH35keYVwwh2KCNXBnXTAdm2XPfM=
github.com/otcshare/common/proxy v0.0.0-20191204122953-5cc7dfd62d15 h1:+shFjGYM3Ly1AnC3lUOCRXBMQYFDrSiYRSLGsFt9dXY=
github.com/otcshare/common/proxy v0.0.0-20191204122953-5cc7dfd62d15/go.mod h1:IFSNKTbdSLvDVV/BxgI8Ff2pUt/12a37gVGm/vLFhJ0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
2 changes: 1 addition & 1 deletion internal/metadatahelpers/metadatahelpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os"
"path/filepath"

metadata "github.com/otcshare/edgenode/pkg/app-metadata"
metadata "github.com/open-ness/edgenode/pkg/app-metadata"

"github.com/onsi/ginkgo"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/stubs/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network"
"github.com/otcshare/edgenode/internal/wrappers"
"github.com/open-ness/edgenode/internal/wrappers"
)

// DockerCliStub stores DockerClientStub
Expand Down
2 changes: 1 addition & 1 deletion internal/stubs/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package stubs
import (
"net/http"

"github.com/otcshare/edgenode/internal/wrappers"
"github.com/open-ness/edgenode/internal/wrappers"
)

// HTTPCliStub stores HTTPClientStub
Expand Down
2 changes: 1 addition & 1 deletion internal/stubs/libvirt.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package stubs

import (
libvirt "github.com/libvirt/libvirt-go"
wrapp "github.com/otcshare/edgenode/internal/wrappers"
wrapp "github.com/open-ness/edgenode/internal/wrappers"
)

// ConnStub stores LibvirtConnectStub
Expand Down
4 changes: 2 additions & 2 deletions pkg/app-metadata/app_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"os"
"path"

logger "github.com/otcshare/common/log"
pb "github.com/otcshare/edgenode/pkg/eva/pb"
logger "github.com/open-ness/common/log"
pb "github.com/open-ness/edgenode/pkg/eva/pb"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/app-metadata/app_metadata_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"path/filepath"
"testing"

. "github.com/otcshare/edgenode/internal/metadatahelpers"
metadata "github.com/otcshare/edgenode/pkg/app-metadata"
pb "github.com/otcshare/edgenode/pkg/eva/pb"
. "github.com/open-ness/edgenode/internal/metadatahelpers"
metadata "github.com/open-ness/edgenode/pkg/app-metadata"
pb "github.com/open-ness/edgenode/pkg/eva/pb"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions pkg/auth/enroll.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"path/filepath"
"time"

logger "github.com/otcshare/common/log"
pb "github.com/otcshare/edgenode/pkg/auth/pb"
logger "github.com/open-ness/common/log"
pb "github.com/open-ness/edgenode/pkg/auth/pb"
"github.com/pkg/errors"
"google.golang.org/grpc"
grpcCreds "google.golang.org/grpc/credentials"
Expand Down
4 changes: 2 additions & 2 deletions pkg/auth/enroll_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

"github.com/otcshare/edgenode/pkg/auth"
pb "github.com/otcshare/edgenode/pkg/auth/pb"
"github.com/open-ness/edgenode/pkg/auth"
pb "github.com/open-ness/edgenode/pkg/auth/pb"
)

func TestEnroll(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/pki_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"github.com/otcshare/edgenode/pkg/auth"
"github.com/open-ness/edgenode/pkg/auth"
)

func TestPKI(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cni/cni_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ package cni
import (
"context"

metadata "github.com/otcshare/edgenode/pkg/app-metadata"
ovncni "github.com/otcshare/edgenode/pkg/ovncni"
metadata "github.com/open-ness/edgenode/pkg/app-metadata"
ovncni "github.com/open-ness/edgenode/pkg/ovncni"
"github.com/pkg/errors"
)

// Type defines enum for CNIs types
type Type string

const (
// OVN mean that OVN CNI is used (github.com/otcshare/edgenode/pkg/ovncni)
// OVN mean that OVN CNI is used (github.com/open-ness/edgenode/pkg/ovncni)
OVN Type = "ovn"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cni/cni_invoke.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"

"github.com/kata-containers/runtime/virtcontainers/pkg/nsenter"
evapb "github.com/otcshare/edgenode/pkg/eva/pb"
evapb "github.com/open-ness/edgenode/pkg/eva/pb"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/cni/cni_invoke_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os"
"path/filepath"

evapb "github.com/otcshare/edgenode/pkg/eva/pb"
evapb "github.com/open-ness/edgenode/pkg/eva/pb"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cni/infrastructure_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"io/ioutil"
"time"

logger "github.com/otcshare/common/log"
"github.com/otcshare/edgenode/internal/wrappers"
logger "github.com/open-ness/common/log"
"github.com/open-ness/edgenode/internal/wrappers"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cni/infrastructure_container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"

"github.com/docker/docker/api/types/container"
"github.com/otcshare/edgenode/internal/stubs"
"github.com/otcshare/edgenode/internal/wrappers"
"github.com/open-ness/edgenode/internal/stubs"
"github.com/open-ness/edgenode/internal/wrappers"

"github.com/docker/docker/api/types"

Expand Down
2 changes: 1 addition & 1 deletion pkg/eaa/api_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net/http"
"time"

pb "github.com/otcshare/edgenode/pkg/eva/internal_pb"
pb "github.com/open-ness/edgenode/pkg/eva/internal_pb"
"github.com/pkg/errors"
"google.golang.org/grpc"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/eaa/api_auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/otcshare/edgenode/pkg/auth"
"github.com/otcshare/edgenode/pkg/eaa"
"github.com/open-ness/edgenode/pkg/auth"
"github.com/open-ness/edgenode/pkg/eaa"
)

// PrepareCertificateRequestTemplate prepares a template
Expand Down
2 changes: 1 addition & 1 deletion pkg/eaa/api_eaa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
. "github.com/onsi/gomega"

"github.com/gorilla/websocket"
"github.com/otcshare/edgenode/pkg/eaa"
"github.com/open-ness/edgenode/pkg/eaa"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/eaa/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package eaa

import "github.com/otcshare/edgenode/pkg/util"
import "github.com/open-ness/edgenode/pkg/util"

// CertsInfo describes paths for certs used in configuration
type CertsInfo struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/eaa/eaa_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ import (
"google.golang.org/grpc"

"github.com/gorilla/websocket"
"github.com/otcshare/edgenode/internal/authtest"
"github.com/otcshare/edgenode/pkg/eaa"
evapb "github.com/otcshare/edgenode/pkg/eva/internal_pb"
"github.com/open-ness/edgenode/internal/authtest"
"github.com/open-ness/edgenode/pkg/eaa"
evapb "github.com/open-ness/edgenode/pkg/eva/internal_pb"

"github.com/otcshare/common/log"
"github.com/open-ness/common/log"
)

// EaaCommonName Common Name that EAA uses for TLS connection
Expand Down
6 changes: 3 additions & 3 deletions pkg/eaa/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"os"
"path/filepath"

logger "github.com/otcshare/common/log"
"github.com/otcshare/edgenode/pkg/config"
"github.com/otcshare/edgenode/pkg/util"
logger "github.com/open-ness/common/log"
"github.com/open-ness/edgenode/pkg/config"
"github.com/open-ness/edgenode/pkg/util"
)

type services map[string]Service
Expand Down
2 changes: 1 addition & 1 deletion pkg/eaa/pki_initialiser.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"os"
"time"

"github.com/otcshare/edgenode/pkg/auth"
"github.com/open-ness/edgenode/pkg/auth"

"github.com/pkg/errors"
)
Expand Down
Loading

0 comments on commit bff3781

Please sign in to comment.