[VOL-5246] - branch and release bbsim
go.mod
------
o Update package voltha-protos to v5.4.11
o Update package device-management-interface to v1.16.0
go.sum
cmd/
internal/
vendor/
---------
o Update copyright notice
o Invoke make mod-update to refresh dependencies.
makefiles/golang/mod-update.mk
------------------------------
o Target mod-tidy must also pay attention to LOCAL_FIX_PERMS=1
else go.sum cannot be re-written in local-dev-mode.
Change-Id: I7f565e6ce72273b239ad7b63c5da387c18f30bfe
diff --git a/cmd/bbsimctl/bbsimctl.go b/cmd/bbsimctl/bbsimctl.go
index 968cd51..0db983d 100644
--- a/cmd/bbsimctl/bbsimctl.go
+++ b/cmd/bbsimctl/bbsimctl.go
@@ -1,5 +1,5 @@
/*
- * Portions copyright 2019-present Open Networking Foundation
+ * Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
* Original copyright 2019-present Ciena Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 54464f9..d3a0130 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -34,7 +34,7 @@
# -- Project information -----------------------------------------------------
project = u'BBSim'
-copyright = u'2019, Open Networking Foundation'
+Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
author = u'Open Networking Foundation'
# The short X.Y version
diff --git a/go.mod b/go.mod
index fe35607..8289cf7 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,7 @@
github.com/opencord/cordctl v0.0.0-20190909161711-01e9c1f04bf4
github.com/opencord/device-management-interface v1.4.0
github.com/opencord/omci-lib-go/v2 v2.2.3
- github.com/opencord/voltha-protos/v5 v5.4.10
+ github.com/opencord/voltha-protos/v5 v5.4.11
github.com/pkg/errors v0.8.1 // indirect
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.5.1
diff --git a/go.sum b/go.sum
index 60c0702..9585022 100644
--- a/go.sum
+++ b/go.sum
@@ -89,8 +89,8 @@
github.com/opencord/device-management-interface v1.4.0/go.mod h1:G1owSqGBGaqllrwtjxfLTsy9EDsGhdhmqkJM3XOnPD0=
github.com/opencord/omci-lib-go/v2 v2.2.3 h1:cE9+67m8HmZmlET57eyQmqOOAJlfvvKrLgiJMiwhSMg=
github.com/opencord/omci-lib-go/v2 v2.2.3/go.mod h1:o1S/jhDLHNikFU7uG2TR5UOM5KmKlqwLlVncXi0FBYQ=
-github.com/opencord/voltha-protos/v5 v5.4.10 h1:Z2Y5Kunwume/IUde1ZxdsQ9vF8Q4miaEe9Oeag8vcKs=
-github.com/opencord/voltha-protos/v5 v5.4.10/go.mod h1:E/Jn3DNu8VGRBCgIWSSg4sWtTBiNuQGSFvHyNH1XlyM=
+github.com/opencord/voltha-protos/v5 v5.4.11 h1:Q9j8yJO5HDf0D3jE8KmIgUWJjV4GIYgqiDEiPI3Zcmc=
+github.com/opencord/voltha-protos/v5 v5.4.11/go.mod h1:E/Jn3DNu8VGRBCgIWSSg4sWtTBiNuQGSFvHyNH1XlyM=
github.com/pierrec/lz4 v2.4.1+incompatible h1:mFe7ttWaflA46Mhqh+jUfjp2qTbPYxLB2/OyBppH9dg=
github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
diff --git a/internal/bbsimctl/commands/config.go b/internal/bbsimctl/commands/config.go
index c3d8a14..f7c8814 100644
--- a/internal/bbsimctl/commands/config.go
+++ b/internal/bbsimctl/commands/config.go
@@ -1,5 +1,5 @@
/*
- * Portions copyright 2019-present Open Networking Foundation
+ * Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
* Original copyright 2019-present Ciena Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,7 @@
)
const copyrightNotice = `
-# Portions copyright 2019-present Open Networking Foundation
+# Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
# Original copyright 2019-present Ciena Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/internal/bbsimctl/commands/olt.go b/internal/bbsimctl/commands/olt.go
index f64f16b..cf8f3ce 100644
--- a/internal/bbsimctl/commands/olt.go
+++ b/internal/bbsimctl/commands/olt.go
@@ -1,5 +1,5 @@
/*
- * Portions copyright 2019-present Open Networking Foundation
+ * Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
* Original copyright 2019-present Ciena Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/internal/bbsimctl/commands/onu.go b/internal/bbsimctl/commands/onu.go
index a6f070c..ae398b5 100644
--- a/internal/bbsimctl/commands/onu.go
+++ b/internal/bbsimctl/commands/onu.go
@@ -1,5 +1,5 @@
/*
- * Portions copyright 2019-present Open Networking Foundation
+ * Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
* Original copyright 2019-present Ciena Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/internal/bbsimctl/commands/onualarms.go b/internal/bbsimctl/commands/onualarms.go
index 669c173..41f822b 100755
--- a/internal/bbsimctl/commands/onualarms.go
+++ b/internal/bbsimctl/commands/onualarms.go
@@ -1,5 +1,5 @@
/*
- * Portions copyright 2019-present Open Networking Foundation
+ * Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
* Original copyright 2019-present Ciena Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/internal/bbsimctl/commands/uni.go b/internal/bbsimctl/commands/uni.go
index 834c2e7..b04dda4 100644
--- a/internal/bbsimctl/commands/uni.go
+++ b/internal/bbsimctl/commands/uni.go
@@ -1,5 +1,5 @@
/*
- * Portions copyright 2019-present Open Networking Foundation
+ * Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
* Original copyright 2019-present Ciena Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/internal/bbsimctl/completion/bash.go b/internal/bbsimctl/completion/bash.go
index 67e731a..95d31d0 100644
--- a/internal/bbsimctl/completion/bash.go
+++ b/internal/bbsimctl/completion/bash.go
@@ -16,7 +16,7 @@
package completion
const Bash = `
-# Portions copyright 2019-present Open Networking Foundation
+# Portions Copyright 2019-2024 Open Networking Foundation (ONF) and the ONF Contributors
# Original copyright 2019-present Ciena Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/makefiles/golang/mod-update.mk b/makefiles/golang/mod-update.mk
index a55914e..7440142 100644
--- a/makefiles/golang/mod-update.mk
+++ b/makefiles/golang/mod-update.mk
@@ -17,22 +17,21 @@
# SPDX-FileCopyrightText: 2024 Open Networking Foundation (ONF) and the ONF Contributors
# SPDX-License-Identifier: Apache-2.0
# -----------------------------------------------------------------------
-# https://gerrit.opencord.org/plugins/gitiles/onf-make
-# ONF.makefiles.include.version = 1.1
-# -----------------------------------------------------------------------
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------
-## if dev-mode: make LOCAL_FIX_PERMS=1 mod-update
.PHONY: mod-update
mod-update: mod-tidy mod-vendor
## -----------------------------------------------------------------------
+## Intent: Invoke the golang mod tidy command
## -----------------------------------------------------------------------
.PHONY: mod-tidy
mod-tidy :
$(call banner-enter,Target $@)
+ $(if $(LOCAL_FIX_PERMS),chmod o+w $(CURDIR))
${GO} mod tidy
+ $(if $(LOCAL_FIX_PERMS),chmod o-w $(CURDIR))
$(call banner-leave,Target $@)
## -----------------------------------------------------------------------
@@ -47,14 +46,32 @@
$(call banner-leave,Target $@)
## -----------------------------------------------------------------------
+## Intent: Display topic help
+## Usage:
+## % make help
## -----------------------------------------------------------------------
-help ::
- @echo ' mod-update mod-tidy & mod-update'
- @echo ' mod-tidy go mod tidy'
- @echo ' mod-vendor go mod vendor'
-
+help-summary ::
+ @printf ' %-30s %s\n' 'mod-update' \
+ 'Alias for make mod-tidy mod-update (GOLANG)'
ifdef VERBOSE
- @echo ' LOCAL_FIX_PERMS=1 Local hack to fix docker uid/gid volume problem'
+ @$(MAKE) --no-print-directory mod-update-help
endif
+## -----------------------------------------------------------------------
+## Intent: Display extended topic help
+## Usage:
+## % make mod-update-help
+## % make help VERBOSE=1
+## -----------------------------------------------------------------------
+.PHONY: mod-update-help
+mod-update-help ::
+ @printf ' %-30s %s\n' 'mod-tidy'\
+ 'Invoke go mod tidy'
+ @printf ' %-30s %s\n' 'mod-vendor'\
+ 'Invoke go mod vendor'
+ @echo
+ @echo '[MODIFIER]'
+ @printf ' %-30s %s\n' 'LOCAL_FIX_PERMS=1' \
+ 'Local dev hack to fix docker uid/gid volume problem'
+
# [EOF]
diff --git a/vendor/modules.txt b/vendor/modules.txt
index c2c6734..f0e9ca1 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -79,7 +79,7 @@
# github.com/opencord/omci-lib-go/v2 v2.2.3
github.com/opencord/omci-lib-go/v2
github.com/opencord/omci-lib-go/v2/generated
-# github.com/opencord/voltha-protos/v5 v5.4.10
+# github.com/opencord/voltha-protos/v5 v5.4.11
github.com/opencord/voltha-protos/v5/go/ext/config
github.com/opencord/voltha-protos/v5/go/extension
github.com/opencord/voltha-protos/v5/go/openolt