Skip to content

Commit

Permalink
Update license to Apache-2.0 (#475)
Browse files Browse the repository at this point in the history
* Update license to Apache-2.0

* Handle auto-generate bmd_bytes and simplify dep5
  • Loading branch information
ccascone authored Feb 3, 2022
1 parent b68de84 commit 6ffb154
Show file tree
Hide file tree
Showing 232 changed files with 247 additions and 544 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2021-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

# This file specifies the default values for environment variables used
# throughout this project. Default values can be overridden via the command
Expand Down
3 changes: 2 additions & 1 deletion .github/format.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
# Copyright 2021-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0 AND Apache-2.0
# SPDX-License-Identifier: Apache-2.0


set -e

Expand Down
2 changes: 1 addition & 1 deletion .github/linters/.isort.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0
[settings]
profile = black
2 changes: 1 addition & 1 deletion .github/linters/.python-black
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0
[tool.black]
line-length = 88
target-version = ['py38', 'py27']
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

---
name: Lint Code Base
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prettify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

---
name: Prettify Python Code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reuse.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

---
name: REUSE
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2021-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0
p4src/tna/build
p4src/v1model/build
target
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

// To validate: ./jflint.sh Jenkinsfile

Expand Down
2 changes: 1 addition & 1 deletion .jenkins/jflint.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright 2021-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0
#
# curl commands from: https://jenkins.io/doc/book/pipeline/development/#linter
set -e -u -o pipefail
Expand Down
2 changes: 1 addition & 1 deletion .jenkins/linerate.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

# The Jenkins job `fabric-tna-linerate-tests` executing this script is maintained in
# the ONOS ci-management repo:
Expand Down
14 changes: 3 additions & 11 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,11 @@ Source: https://github.com/stratum/fabric-tna

Files: tofino-netcfg.json ptf/run/tm/*.json ptf/run/hw/*.json src/test/resources/*.json .vscode/settings.json
Copyright: 2020-present Open Networking Foundation
License: LicenseRef-ONF-Member-Only-1.0
License: Apache-2.0

Files: ptf/run/bmv2/chassis_config.txt
Files: ptf/run/bmv2/chassis_config.txt ptf/tests/common/bmd_bytes.py ptf/run/bmv2/port_map.veth.json ptf/images/*
Copyright: 2021-present Open Networking Foundation
License: LicenseRef-ONF-Member-Only-1.0

Files: ptf/run/bmv2/port_map.veth.json
Copyright: 2021-present Open Networking Foundation
License: LicenseRef-ONF-Member-Only-1.0

Files: ptf/images/*
Copyright: 2021-present Open Networking Foundation
License: LicenseRef-ONF-Member-Only-1.0
License: Apache-2.0

Files: src/main/resources/META-INF/NOTICE
Copyright: No Copyright
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright 2020-present Open Networking Foundation
SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
SPDX-License-Identifier: Apache-2.0
-->

# How to Contribute
Expand Down
294 changes: 0 additions & 294 deletions LICENSES/LicenseRef-ONF-Member-Only-1.0.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

# Absolute directory of this Makefile
DIR := $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright 2020-present Open Networking Foundation
SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
SPDX-License-Identifier: Apache-2.0
-->

# Fabric-TNA
Expand Down
2 changes: 1 addition & 1 deletion app.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2020-present Open Networking Foundation
SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
SPDX-License-Identifier: Apache-2.0
-->
<app name="org.stratumproject.fabric-tna" origin="Open Networking Foundation"
version="${project.version}"
Expand Down
2 changes: 1 addition & 1 deletion features.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
Copyright 2020-present Open Networking Foundation
SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
SPDX-License-Identifier: Apache-2.0
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
<feature name="${project.artifactId}" version="${project.version}"
Expand Down
2 changes: 1 addition & 1 deletion p4src/shared/define.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include "size.p4"

Expand Down
2 changes: 1 addition & 1 deletion p4src/shared/header.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __HEADER__
#define __HEADER__
Expand Down
2 changes: 1 addition & 1 deletion p4src/shared/size.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0
#ifndef __TABLE_SIZE__
#define __TABLE_SIZE__

Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright 2020-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

set -eu -o pipefail

Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/fabric_tna.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/acl.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/filtering.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/forwarding.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/hasher.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include "shared/define.p4"
#include "shared/header.p4"
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/int.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2017-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __INT_MAIN__
#define __INT_MAIN__
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/int_parser.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __INT_PARSER__
#define __INT_PARSER__
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/lookup_md_init.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/next.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/packet_in_mirror_parser.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __PACKET_IN_MIRROR_PARSER__
#define __PACKET_IN_MIRROR_PARSER__
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/packetio.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include "shared/header.p4"

Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/pre_next.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/slicing.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <tna.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/spgw.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __SPGW__
#define __SPGW__
Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/control/stats.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include "shared/header.p4"

Expand Down
2 changes: 1 addition & 1 deletion p4src/tna/include/parser.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2020-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __PARSER__
#define __PARSER__
Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# shellcheck disable=SC2086
# Copyright 2021-present Open Networking Foundation
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
# SPDX-License-Identifier: Apache-2.0

set -e

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/fabric_v1model.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0


#ifndef V1MODEL
Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/acl.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>
#include <v1model.p4>
Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/checksum.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __CHECKSUM__
#define __CHECKSUM__
Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/filtering.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/forwarding.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/hasher.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include "v1model/include/define_v1model.p4"
#include "v1model/include/header_v1model.p4"
Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/int.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __INT_MAIN__
#define __INT_MAIN__
Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/int_tna_parser_emulator.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2022-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __INT_PARSER_EMU__
#define __INT_PARSER_EMU__
Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/lookup_md_init.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/next.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/packetio.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include "v1model/include/header_v1model.p4"

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/pre_next.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/slicing.p4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#include <core.p4>

Expand Down
2 changes: 1 addition & 1 deletion p4src/v1model/include/control/spgw.p4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Copyright 2021-present Open Networking Foundation
// SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
// SPDX-License-Identifier: Apache-2.0

#ifndef __SPGW__
#define __SPGW__
Expand Down
Loading

0 comments on commit 6ffb154

Please sign in to comment.