[VOL-5346] Update copyright notice, gather profiling stats.
[See Also] https://gerrit.opencord.org/c/voltha-go-controller/+/35217
o No jira ticket available yet so reference gerrit patch.
VERSION
-------
o Bump version string for the patch.
database/database.go
internal/pkg/application/application.go
internal/pkg/application/service.go
internal/pkg/util/envutils/envutils.go
tests/results/go-test-coverage.out
tests/results/go-test-coverage.xml
tests/results/go-test-results.xml
voltha-go-controller/nbi/bwprofile.go
voltha-go-controller/nbi/igmpproxy.go
voltha-go-controller/nbi/mvlan.go
---------------------------------------
o Update copyright notice to contain SPDX tokens and span 2024.
o This patch is submitted for side effects, generate comparison stats.
o Patch 35217 failed make sca/profiling phase due to a timeout.
o Copyright edits will run a NOP version of the original patch to
determine if the timeout is pre-existing or new behavior.
Change-Id: I7f63613c71c8a4eee80ad5d6332810dc9b5b361c
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
diff --git a/VERSION b/VERSION
index 772a55e..21d6c27 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.1-dev
\ No newline at end of file
+0.0.1-dev1
diff --git a/database/database.go b/database/database.go
index 44c37a5..5be86b5 100644
--- a/database/database.go
+++ b/database/database.go
@@ -1,17 +1,23 @@
-/*
-* Copyright 2022-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.
+/* -----------------------------------------------------------------------
+ * Copyright 2022-2024 Open Networking Foundation Contributors
+ *
+ * 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: 2022-2024 Open Networking Foundation Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ * -----------------------------------------------------------------------
*/
+
// This implementation of database assumes that it is working for
// Open ONU adapter. Thus, it assumes some base path for all the
// database operations. For all database operations, the key passed is
diff --git a/internal/pkg/application/application.go b/internal/pkg/application/application.go
index 5a7dc27..c87e419 100644
--- a/internal/pkg/application/application.go
+++ b/internal/pkg/application/application.go
@@ -1,16 +1,21 @@
-/*
-* Copyright 2022-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.
+/* -----------------------------------------------------------------------
+ * Copyright 2022-2024 Open Networking Foundation Contributors
+ *
+ * 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: 2022-2024 Open Networking Foundation Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ * -----------------------------------------------------------------------
*/
package application
diff --git a/internal/pkg/application/service.go b/internal/pkg/application/service.go
index 2c16f29..5f7178b 100644
--- a/internal/pkg/application/service.go
+++ b/internal/pkg/application/service.go
@@ -1,16 +1,21 @@
-/*
-* Copyright 2022-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.
+/* -----------------------------------------------------------------------
+ * Copyright 2022-2024 Open Networking Foundation Contributors
+ *
+ * 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: 2022-2024 Open Networking Foundation Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ * -----------------------------------------------------------------------
*/
package application
diff --git a/internal/pkg/util/envutils/envutils.go b/internal/pkg/util/envutils/envutils.go
index ba70d5e..10a3219 100644
--- a/internal/pkg/util/envutils/envutils.go
+++ b/internal/pkg/util/envutils/envutils.go
@@ -1,18 +1,21 @@
-/*
-
-
-* Copyright 2022-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.
+/* -----------------------------------------------------------------------
+ * Copyright 2022-2024 Open Networking Foundation Contributors
+ *
+ * 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: 2022-2024 Open Networking Foundation Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ * -----------------------------------------------------------------------
*/
// Package envutils provides the env parsing utility functions
diff --git a/tests/results/go-test-coverage.out b/tests/results/go-test-coverage.out
index 7fa0582..4acb0dd 100644
--- a/tests/results/go-test-coverage.out
+++ b/tests/results/go-test-coverage.out
@@ -1,5 +1,6 @@
+# -----------------------------------------------------------------------
+# Copyright 202-2024 Open Networking Foundation Contributors
#
-# Copyright 2022-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
@@ -11,7 +12,10 @@
# 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: 2022-2024 Open Networking Foundation Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
mode: count
voltha-go-controller/internal/pkg/of/group.go:70.65,84.47 4 0
diff --git a/tests/results/go-test-coverage.xml b/tests/results/go-test-coverage.xml
index 42b8062..68d0a99 100644
--- a/tests/results/go-test-coverage.xml
+++ b/tests/results/go-test-coverage.xml
@@ -1,15 +1,23 @@
-<!--
- Copyright 2022-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.
- -->
+<!---
+# -----------------------------------------------------------------------
+# Copyright 2022-2024 Open Networking Foundation Contributors
+#
+# 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: 2022-2024 Open Networking Foundation Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+--->
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
diff --git a/tests/results/go-test-results.xml b/tests/results/go-test-results.xml
index 518f8f2..e95e8a3 100644
--- a/tests/results/go-test-results.xml
+++ b/tests/results/go-test-results.xml
@@ -1,15 +1,23 @@
-<!--
- Copyright 2022-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.
- -->
+<!---
+# -----------------------------------------------------------------------
+# Copyright 2022-2024 Open Networking Foundation Contributors
+#
+# 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: 2022-2024 Open Networking Foundation Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+--->
<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
diff --git a/voltha-go-controller/nbi/bwprofile.go b/voltha-go-controller/nbi/bwprofile.go
index 3dfd015..a630616 100644
--- a/voltha-go-controller/nbi/bwprofile.go
+++ b/voltha-go-controller/nbi/bwprofile.go
@@ -1,16 +1,21 @@
-/*
-* Copyright 2022-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.
+/* -----------------------------------------------------------------------
+ * Copyright 2022-2024 Open Networking Foundation Contributors
+ *
+ * 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: 2022-2024 Open Networking Foundation Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ * -----------------------------------------------------------------------
*/
package nbi
diff --git a/voltha-go-controller/nbi/igmpproxy.go b/voltha-go-controller/nbi/igmpproxy.go
index 6ee8ffc..1961d8b 100644
--- a/voltha-go-controller/nbi/igmpproxy.go
+++ b/voltha-go-controller/nbi/igmpproxy.go
@@ -1,16 +1,22 @@
/*
-* Copyright 2022-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.
+ * -----------------------------------------------------------------------
+ * Copyright 2022-2024 Open Networking Foundation Contributors
+ *
+ * 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: 2020-2024 Open Networking Foundation Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ * -----------------------------------------------------------------------
*/
package nbi
diff --git a/voltha-go-controller/nbi/mvlan.go b/voltha-go-controller/nbi/mvlan.go
index e7e25c0..5c77793 100644
--- a/voltha-go-controller/nbi/mvlan.go
+++ b/voltha-go-controller/nbi/mvlan.go
@@ -1,16 +1,21 @@
-/*
-* Copyright 2022-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.
+/* -----------------------------------------------------------------------
+ * Copyright 2022-2024 Open Networking Foundation Contributors
+ *
+ * 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: 2022-2024 Open Networking Foundation Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ * -----------------------------------------------------------------------
*/
package nbi