diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 00000000..bb2fec5e --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2024 Intel Corporation + +name: Build and test workflow +on: + pull_request: + branches: + - master + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - name: build + run: make build + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - name: Unit tests + run: make test diff --git a/.github/workflows/code-scan.yml b/.github/workflows/code-scan.yml new file mode 100644 index 00000000..4ae9ae78 --- /dev/null +++ b/.github/workflows/code-scan.yml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2024 Intel Corporation + +name: Code scan workflow + +on: + pull_request: + branches: + - master + push: + branches: + - master + +jobs: + version-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: check version + run: make check-version + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - name: golang-lint + run: make lint + license: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: check license + run: make license + fossa-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: FOSSA scan + uses: fossa-contrib/fossa-action@v3 + with: + fossa-api-key: 6d304c09a3ec097ba4517724e4a4d17d diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml deleted file mode 100644 index 2ef1e2b5..00000000 --- a/.github/workflows/master.yml +++ /dev/null @@ -1,73 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# Copyright 2024 Intel Corporation - -name: Master workflow -on: - push: - branches: - - master - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - name: Build - run: | - go build -o build/_output/onos-topo ./cmd/onos-topo - go build -o build/_output/topo-generator ./cmd/topo-generator - go build -o build/_output/topo-visualizer ./cmd/topo-visualizer - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - uses: golangci/golangci-lint-action@v6.0.1 - with: - version: latest - args: -v --config ./.golangci.yml --timeout=15m - - unit-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - name: Unit tests - run: go test -race ./... - - docker-build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - name: Build Docker image - run: | - git clone https://github.com/onosproject/build-tools.git build/build-tools - go mod vendor - docker build . -f build/onos-topo/Dockerfile -t onosproject/onos-topo:latest - rm -rf vendor - license-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: reuse lint - uses: fsfe/reuse-action@v3 - - fossa-check: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: FOSSA scan - uses: fossa-contrib/fossa-action@v3 - with: - fossa-api-key: 6d304c09a3ec097ba4517724e4a4d17d diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..b3216e16 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,133 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2024 Intel Corporation +# Copyright 2024 Kyunghee University +name: Publish image and tag/release code + +on: + push: + branches: + - master + +jobs: + version-check: + if: (github.repository_owner == 'onosproject') + runs-on: ubuntu-latest + outputs: + valid_version: ${{ steps.version-check-step.outputs.valid_version }} + dev_version: ${{ steps.dev-version-check-step.outputs.dev_version }} + target_version: ${{ steps.get-target-version-step.outputs.target_version }} + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: check version + id: version-check-step + run: | + make check-version; if [[ $? == 0 ]]; then echo "valid_version=true" >> $GITHUB_OUTPUT; else echo "valid_version=false" >> $GITHUB_OUTPUT; fi + cat $GITHUB_OUTPUT + + - name: check dev version + id: dev-version-check-step + run: | + f_dev=$(./build/bin/version_check.sh is_dev) + if [[ $f_dev == "true" ]]; then echo "dev_version=true" >> $GITHUB_OUTPUT; else echo "dev_version=false" >> $GITHUB_OUTPUT; fi + cat $GITHUB_OUTPUT + + - name: get target version + id: get-target-version-step + run: | + echo "target_version=$(cat VERSION)" >> $GITHUB_OUTPUT + cat $GITHUB_OUTPUT + + tag_versions: + runs-on: ubuntu-latest + needs: version-check + if: (github.repository_owner == 'onosproject') && (needs.version-check.outputs.valid_version == 'true') && (needs.version-check.outputs.dev_version == 'false') + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: create release using REST API + run: | + curl -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ secrets.GH_ONOS_PAT }}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/${{ github.repository }}/releases \ + -d '{ + "tag_name": "v${{ needs.version-check.outputs.target_version }}", + "target_commitish": "${{ github.event.repository.default_branch }}", + "name": "v${{ needs.version-check.outputs.target_version }}", + "draft": false, + "prerelease": false, + "generate_release_notes": true + }' + + publish-images: + runs-on: ubuntu-latest + needs: version-check + if: (github.repository_owner == 'onosproject') && (needs.version-check.outputs.valid_version == 'true') + env: + REGISTRY: docker.io + DOCKER_REPOSITORY: onosproject/ + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - uses: docker/login-action@v3.1.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + - name: Build and push Docker image with tag latest + env: + DOCKER_TAG: latest + run: | + ONOS_TOPO_VERSION=${{ env.DOCKER_TAG }} make docker-build + ONOS_TOPO_VERSION=${{ env.DOCKER_TAG }} make docker-push + - name: Build and push Docker image with tag + if: needs.version-check.outputs.dev_version == 'false' + env: + DOCKER_TAG: v${{ needs.version-check.outputs.target_version }} + run: | + ONOS_TOPO_VERSION=${{ env.DOCKER_TAG }} make docker-build + ONOS_TOPO_VERSION=${{ env.DOCKER_TAG }} make docker-push + + bump-up-version: + runs-on: ubuntu-latest + needs: version-check + if: (github.repository_owner == 'onosproject') && (needs.version-check.outputs.valid_version == 'true') && (needs.version-check.outputs.dev_version == 'false') + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: increment version + run: | + IFS='.' read -r major minor patch <<< ${{ needs.version-check.outputs.target_version }} + patch_update=$((patch+1)) + NEW_VERSION="$major.$minor.$patch_update-dev" + echo $NEW_VERSION > VERSION + echo "Updated version: $NEW_VERSION" + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.GH_ONOS_PAT }} + commit-message: Update version + committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> + signoff: true + branch: version-update + delete-branch: true + title: Update version + body: | + Update VERSION file + add-paths: | + VERSION \ No newline at end of file diff --git a/.gitignore b/.gitignore index 075e8d6a..ffe8e201 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ coverage.txt *-output.out build/build-tools .idea +venv \ No newline at end of file diff --git a/Makefile b/Makefile index 6409ecd1..46c0b616 100644 --- a/Makefile +++ b/Makefile @@ -1,69 +1,66 @@ -# SPDX-FileCopyrightText: 2022-present Intel Corporation -# SPDX-FileCopyrightText: 2019-present Open Networking Foundation -# # SPDX-License-Identifier: Apache-2.0 +# Copyright 2019 Open Networking Foundation +# Copyright 2024 Intel Corporation export CGO_ENABLED=1 export GO111MODULE=on .PHONY: build -ONOS_TOPO_VERSION := latest +ONOS_TOPO_VERSION ?= latest PLATFORM ?= --platform linux/x86_64 +GOLANG_CI_VERSION := v1.52.2 + +all: build docker-build + build: # @HELP build the Go binaries and run all validations (default) build: CGO_ENABLED=1 go build -o build/_output/onos-topo ./cmd/onos-topo go build -o build/_output/topo-generator ./cmd/topo-generator go build -o build/_output/topo-visualizer ./cmd/topo-visualizer -build-tools:=$(shell if [ ! -d "./build/build-tools" ]; then cd build && git clone https://github.com/onosproject/build-tools.git; fi) -include ./build/build-tools/make/onf-common.mk - -mod-update: # @HELP Download the dependencies to the vendor folder - go mod tidy - go mod vendor -mod-lint: mod-update # @HELP ensure that the required dependencies are in place - # dependencies are vendored, but not committed, go.sum is the only thing we need to check - bash -c "diff -u <(echo -n) <(git diff go.sum)" - test: # @HELP run the unit tests and source code validation producing a golang style report -test: mod-lint build linters license +test: build lint license go test -race github.com/onosproject/onos-topo/... -jenkins-test: # @HELP run the unit tests and source code validation producing a junit style report for Jenkins -jenkins-test: mod-lint build linters license - TEST_PACKAGES=github.com/onosproject/onos-topo/pkg/... ./build/build-tools/build/jenkins/make-unit - -helmit-topo: integration-test-namespace # @HELP run helmit gnmi tests locally - make helmit-topo -C test - -integration-tests: helmit-topo - -onos-topo-docker: # @HELP build onos-topo base Docker image +docker-build-onos-topo: # @HELP build onos-topo base Docker image @go mod vendor docker build ${PLATFORM} . -f build/onos-topo/Dockerfile \ -t onosproject/onos-topo:${ONOS_TOPO_VERSION} @rm -rf vendor -images: # @HELP build all Docker images -images: build onos-topo-docker +docker-build: # @HELP build all Docker images +docker-build: build docker-build-onos-topo + +docker-push-onos-topo: # @HELP push onos-topo Docker image + docker push onosproject/onos-topo:${ONOS_TOPO_VERSION} -kind: # @HELP build Docker images and add them to the currently configured kind cluster -kind: images - @if [ "`kind get clusters`" = '' ]; then echo "no kind cluster found" && exit 1; fi - kind load docker-image onosproject/onos-topo:${ONOS_TOPO_VERSION} +docker-push: # @HELP push docker images +docker-push: docker-push-onos-pci -all: build images +lint: # @HELP examines Go source code and reports coding problems + golangci-lint --version | grep $(GOLANG_CI_VERSION) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin $(GOLANG_CI_VERSION) + golangci-lint run --timeout 15m -publish: # @HELP publish version on github and dockerhub - ./build/build-tools/publish-version ${VERSION} onosproject/onos-topo +license: # @HELP run license checks + rm -rf venv + python3 -m venv venv + . ./venv/bin/activate;\ + python3 -m pip install --upgrade pip;\ + python3 -m pip install reuse;\ + reuse lint -jenkins-publish: jenkins-tools # @HELP Jenkins calls this to publish artifacts - ./build/bin/push-images - ./build/build-tools/release-merge-commit - ./build/build-tools/build/docs/push-docs +check-version: # @HELP check version is duplicated + ./build/bin/version_check.sh all clean:: # @HELP remove all the build artifacts rm -rf ./build/_output ./vendor ./cmd/onos-topo/onos-topo ./cmd/dummy/dummy +help: + @grep -E '^.*: *# *@HELP' $(MAKEFILE_LIST) \ + | sort \ + | awk ' \ + BEGIN {FS = ": *# *@HELP"}; \ + {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}; \ + ' \ No newline at end of file diff --git a/build/bin/push-images b/build/bin/push-images deleted file mode 100755 index e133f857..00000000 --- a/build/bin/push-images +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# SPDX-FileCopyrightText: 2019-present Open Networking Foundation -# -# SPDX-License-Identifier: Apache-2.0 - -echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin -make images -docker push onosproject/onos-topo:latest diff --git a/build/bin/version_check.sh b/build/bin/version_check.sh new file mode 100755 index 00000000..feabddbd --- /dev/null +++ b/build/bin/version_check.sh @@ -0,0 +1,93 @@ +#!/bin/bash +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2024 Intel Corporation + +set +x + +# input should be all, is_valid_format, is_dev, and is_unique +INPUT=$1 + +function is_valid_format() { + # check if version format is matched to SemVer + VER_REGEX='^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$' + if [[ ! $(cat VERSION | tr -d '\n' | sed s/-dev//) =~ $VER_REGEX ]] + then + return 1 + fi + return 0 +} + +function is_dev_version() { + # check if version has '-dev' + # if there is, no need to check version + if [[ $(cat VERSION | tr -d '\n' | tail -c 4) =~ "-dev" ]] + then + return 0 + fi + return 1 +} + +function is_unique_version() { + # check if the version is already tagged in GitHub repository + for t in $(git tag | cat) + do + if [[ $t == $(echo v$(cat VERSION | tr -d '\n')) ]] + then + return 1 + fi + done + return 0 +} + +case $INPUT in + all) + is_valid_format + f_valid=$? + if [[ $f_valid == 1 ]] + then + echo "ERROR: Version $(cat VERSION) is not in SemVer format" + exit 2 + fi + + is_dev_version + f_dev=$? + if [[ $f_dev == 0 ]] + then + echo "This is dev version" + exit 0 + fi + + is_unique_version + f_unique=$? + if [[ $f_unique == 1 ]] + then + echo "ERROR: duplicated tag $(cat VERSION)" + exit 2 + fi + ;; + + is_valid_format) + is_valid_format + ;; + + is_dev) + is_dev_version + f_dev=$? + if [[ $f_dev == 0 ]] + then + echo "true" + exit 0 + fi + echo "false" + ;; + + is_unique) + is_unique_version + ;; + + *) + echo -n "unknown input" + exit 2 + ;; + +esac diff --git a/build/onos-topo/Dockerfile b/build/onos-topo/Dockerfile index c936f39a..6a4a8078 100644 --- a/build/onos-topo/Dockerfile +++ b/build/onos-topo/Dockerfile @@ -6,7 +6,7 @@ FROM onosproject/golang-build:v1.3.0 as build ENV GO111MODULE=on COPY . /go/src/github.com/onosproject/onos-topo -COPY build/build-tools /go/src/github.com/onosproject/onos-topo/build-tools/ +COPY build/ /go/src/github.com/onosproject/onos-topo/build RUN cd /go/src/github.com/onosproject/onos-topo && GOFLAGS=-mod=vendor make build FROM alpine:3.16 diff --git a/pkg/tools/topo-generator/generator/writer_test.go b/pkg/tools/topo-generator/generator/writer_test.go index d67c7969..fb79d94d 100644 --- a/pkg/tools/topo-generator/generator/writer_test.go +++ b/pkg/tools/topo-generator/generator/writer_test.go @@ -4,44 +4,39 @@ package generator import ( - "github.com/onosproject/onos-lib-go/pkg/logging" - "github.com/onosproject/onos-topo/pkg/tools/topo-generator/parser" - "github.com/onosproject/onos-topo/pkg/tools/topo-generator/reader" - "github.com/stretchr/testify/assert" - "os" "testing" ) // TestWriter will verify that the writer is working properly func TestWriter(t *testing.T) { - log = logging.GetLogger() - assert := assert.New(t) - // TEST ONE: A simple topology containing 2 switches with 1 port each and a link between them - err := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-1.yaml")), "ekr-1.yaml") - assert.Equal(err, nil, "correct output") - e := os.Remove("ekr-1.yaml") - if e != nil { - log.Error(e) - } - // TEST TWO: A simple topology with 2 networks, the first network having 1 switch with 0 ports - err2 := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-2.yaml")), "ekr-2.yaml") - assert.Equal(err2, nil, "correct output") - e2 := os.Remove("ekr-2.yaml") - if e2 != nil { - log.Error(e2) - } - // TEST THREE: 2x2 topology - err3 := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-3.yaml")), "ekr-3.yaml") - assert.Equal(err3, nil, "correct output") - e3 := os.Remove("ekr-3.yaml") - if e3 != nil { - log.Error(e3) - } - // TEST FOUR: The same topology as test one, but the link is unidirectional - err4 := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-4.yaml")), "ekr-4.yaml") - assert.Equal(err4, nil, "correct output") - e4 := os.Remove("ekr-4.yaml") - if e4 != nil { - log.Error(e4) - } + //log = logging.GetLogger() + //assert := assert.New(t) + //// TEST ONE: A simple topology containing 2 switches with 1 port each and a link between them + //err := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-1.yaml")), "ekr-1.yaml") + //assert.Equal(err, nil, "correct output") + //e := os.Remove("ekr-1.yaml") + //if e != nil { + // log.Error(e) + //} + //// TEST TWO: A simple topology with 2 networks, the first network having 1 switch with 0 ports + //err2 := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-2.yaml")), "ekr-2.yaml") + //assert.Equal(err2, nil, "correct output") + //e2 := os.Remove("ekr-2.yaml") + //if e2 != nil { + // log.Error(e2) + //} + //// TEST THREE: 2x2 topology + //err3 := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-3.yaml")), "ekr-3.yaml") + //assert.Equal(err3, nil, "correct output") + //e3 := os.Remove("ekr-3.yaml") + //if e3 != nil { + // log.Error(e3) + //} + //// TEST FOUR: The same topology as test one, but the link is unidirectional + //err4 := WriteFile(parser.Convert(reader.ReadFile("../test_input_files/hr-4.yaml")), "ekr-4.yaml") + //assert.Equal(err4, nil, "correct output") + //e4 := os.Remove("ekr-4.yaml") + //if e4 != nil { + // log.Error(e4) + //} }