Skip to content

Commit bd507eb

Browse files
jafingerhutjafingerhut
authored
Use spdx for Barefoot and ONF copyright holder files (#737)
* Move optional steps for testing VMs out of README.md file This may help avoid new users being confused that they must follow those instructions. Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> * Add 2025-Jan-30 versions of source code for install.sh Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> * Use SPDX lines for copyright holder and license info on Barefoot and ONF files That is, files with copyright notices in them that have Barefoot Networks or the Open Networking Foundation as the copyright holder. Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> * Restore some comments that were unintentionally removed. Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> --------- Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
1 parent be30416 commit bd507eb

File tree

20 files changed

+40
-203
lines changed

20 files changed

+40
-203
lines changed

‎utils/mininet/multi_switch_mininet.py‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
11
#!/usr/bin/env python3
2-
# SPDX-License-Identifier: Apache-2.0
3-
4-
# Copyright 2013-present Barefoot Networks, Inc.
5-
#
6-
# Licensed under the Apache License, Version 2.0 (the "License");
7-
# you may not use this file except in compliance with the License.
8-
# You may obtain a copy of the License at
9-
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
12-
# Unless required by applicable law or agreed to in writing, software
13-
# distributed under the License is distributed on an "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
# See the License for the specific language governing permissions and
16-
# limitations under the License.
2+
# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
173
#
4+
# SPDX-License-Identifier: Apache-2.0
185

196
import argparse
207
import importlib

‎utils/mininet/p4_mininet.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright 2013-present Barefoot Networks, Inc.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
152
#
3+
# SPDX-License-Identifier: Apache-2.0
164

175
import os
186
import socket

‎utils/mininet/single_switch_mininet.py‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,7 @@
11
#!/usr/bin/env python3
2-
# SPDX-License-Identifier: Apache-2.0
3-
4-
# Copyright 2013-present Barefoot Networks, Inc.
5-
#
6-
# Licensed under the Apache License, Version 2.0 (the "License");
7-
# you may not use this file except in compliance with the License.
8-
# You may obtain a copy of the License at
9-
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
12-
# Unless required by applicable law or agreed to in writing, software
13-
# distributed under the License is distributed on an "AS IS" BASIS,
14-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
# See the License for the specific language governing permissions and
16-
# limitations under the License.
2+
# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
173
#
4+
# SPDX-License-Identifier: Apache-2.0
185

196
import argparse
207
from subprocess import PIPE, Popen

‎utils/netstat.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright 2017-present Open Networking Foundation
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-FileCopyrightText: 2017 Open Networking Foundation
152
#
3+
# SPDX-License-Identifier: Apache-2.0
164

175
import psutil
186

‎utils/p4_mininet.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright 2013-present Barefoot Networks, Inc.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
152
#
3+
# SPDX-License-Identifier: Apache-2.0
164

175
import os
186
import tempfile

‎utils/p4apprunner.py‎

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

177

188

‎utils/p4runtime_lib/bmv2.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright 2017-present Open Networking Foundation
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-FileCopyrightText: 2017 Open Networking Foundation
152
#
3+
# SPDX-License-Identifier: Apache-2.0
164
from p4.tmp import p4config_pb2
175

186
from .switch import SwitchConnection

‎utils/p4runtime_lib/convert.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright 2017-present Open Networking Foundation
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-FileCopyrightText: 2017 Open Networking Foundation
152
#
3+
# SPDX-License-Identifier: Apache-2.0
164
import math
175
import re
186
import socket

‎utils/p4runtime_lib/error_utils.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright 2013-present Barefoot Networks, Inc.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-FileCopyrightText: 2013 Barefoot Networks, Inc.
152
#
3+
# SPDX-License-Identifier: Apache-2.0
164

175
import sys
186

‎utils/p4runtime_lib/helper.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright 2017-present Open Networking Foundation
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
1+
# SPDX-FileCopyrightText: 2017 Open Networking Foundation
152
#
3+
# SPDX-License-Identifier: Apache-2.0
164
import re
175

186
import google.protobuf.text_format

0 commit comments

Comments
 (0)