Use spdx for Barefoot and ONF copyright holder files

utils/mininet/multi_switch_mininet.py

@@ -1,20 +1,7 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: Apache-2.0
-
-# Copyright 2013-present Barefoot Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0
 
 import argparse
 import importlib

utils/mininet/p4_mininet.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2013-present Barefoot Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 import socket

utils/mininet/single_switch_mininet.py

@@ -1,20 +1,7 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: Apache-2.0
-
-# Copyright 2013-present Barefoot Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0
 
 import argparse
 from subprocess import PIPE, Popen

utils/netstat.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2017 Open Networking Foundation
 #
+# SPDX-License-Identifier: Apache-2.0
 
 import psutil
 

utils/p4_mininet.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2013-present Barefoot Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 import tempfile

utils/p4apprunner.py

@@ -1,18 +1,8 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2013-present Barefoot Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
+
+# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-License-Identifier: Apache-2.0
 
 
 

utils/p4runtime_lib/bmv2.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2017 Open Networking Foundation
 #
+# SPDX-License-Identifier: Apache-2.0
 from p4.tmp import p4config_pb2
 
 from .switch import SwitchConnection

utils/p4runtime_lib/convert.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2017 Open Networking Foundation
 #
+# SPDX-License-Identifier: Apache-2.0
 import math
 import re
 import socket

utils/p4runtime_lib/error_utils.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2013-present Barefoot Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0
 
 import sys
 

utils/p4runtime_lib/helper.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2017 Open Networking Foundation
 #
+# SPDX-License-Identifier: Apache-2.0
 import re
 
 import google.protobuf.text_format

utils/p4runtime_lib/simple_controller.py

@@ -1,20 +1,8 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
+# SPDX-FileCopyrightText: 2017 Open Networking Foundation
 #
+# SPDX-License-Identifier: Apache-2.0
 import argparse
 import json
 import os

utils/p4runtime_lib/switch.py

@@ -1,18 +1,6 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2017 Open Networking Foundation
 #
+# SPDX-License-Identifier: Apache-2.0
 from abc import abstractmethod
 from datetime import datetime
 from queue import Queue

utils/p4runtime_switch.py

@@ -1,19 +1,7 @@
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2017-present Barefoot Networks, Inc.
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2017 Barefoot Networks, Inc.
+# SPDX-FileCopyrightText: 2017 Open Networking Foundation
 #
+# SPDX-License-Identifier: Apache-2.0
 
 import os
 import tempfile

utils/run_exercise.py

@@ -1,25 +1,15 @@
 #!/usr/bin/env python3
-# SPDX-License-Identifier: Apache-2.0
-# Copyright 2013-present Barefoot Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+
+# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0
+
 # Adapted by Robert MacDavid (macdavid@cs.princeton.edu) from scripts found in
 # the p4app repository (https://github.com/p4lang/p4app)
 #
 # We encourage you to dissect this script to better understand the BMv2/Mininet
 # environment used by the P4 tutorial.
-#
+
 import argparse
 import json
 import os

vm-ubuntu-20.04/p4.vim

@@ -1,3 +1,4 @@
+" SPDX-FileCopyrightText: 2014 Barefoot Networks, Inc.
 " SPDX-License-Identifier: Apache-2.0
 " Vim syntax file
 " Language: P4_16

vm-ubuntu-20.04/p4_16-mode.el

@@ -1,7 +1,7 @@
 ;;; p4_16-mode.el --- Support for the P4_16 programming language
+;; SPDX-FileCopyrightText: 2016 Barefoot Networks, Inc.
 ;; SPDX-License-Identifier: Apache-2.0
 
-;; Copyright (C) 2016- Barefoot Networks
 ;; Author: Vladimir Gurevich <vladimir.gurevich@barefootnetworks.com>
 ;; Maintainer: Vladimir Gurevich <vladimir.gurevich@barefootnetworks.com>
 ;; Created: 15 April 2017

vm-ubuntu-24.04/p4.vim

@@ -1,3 +1,4 @@
+" SPDX-FileCopyrightText: 2014 Barefoot Networks, Inc.
 " SPDX-License-Identifier: Apache-2.0
 " Vim syntax file
 " Language: P4_16

vm-ubuntu-24.04/p4_16-mode.el

@@ -1,7 +1,7 @@
 ;;; p4_16-mode.el --- Support for the P4_16 programming language
+;; SPDX-FileCopyrightText: 2016 Barefoot Networks, Inc.
 ;; SPDX-License-Identifier: Apache-2.0
 
-;; Copyright (C) 2016- Barefoot Networks
 ;; Author: Vladimir Gurevich <vladimir.gurevich@barefootnetworks.com>
 ;; Maintainer: Vladimir Gurevich <vladimir.gurevich@barefootnetworks.com>
 ;; Created: 15 April 2017

vm/p4.vim

@@ -1,3 +1,4 @@
+" SPDX-FileCopyrightText: 2014 Barefoot Networks, Inc.
 " SPDX-License-Identifier: Apache-2.0
 " Vim syntax file
 " Language: P4_16

vm/p4_16-mode.el

@@ -1,7 +1,7 @@
 ;;; p4_16-mode.el --- Support for the P4_16 programming language
+;; SPDX-FileCopyrightText: 2016 Barefoot Networks, Inc.
 ;; SPDX-License-Identifier: Apache-2.0
 
-;; Copyright (C) 2016- Barefoot Networks
 ;; Author: Vladimir Gurevich <vladimir.gurevich@barefootnetworks.com>
 ;; Maintainer: Vladimir Gurevich <vladimir.gurevich@barefootnetworks.com>
 ;; Created: 15 April 2017