Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vnf-onboarding
OSM Packages
Commits
0a393e16
Commit
0a393e16
authored
Nov 09, 2021
by
bravof
Browse files
feature: sol004 and sol007 new packages
Signed-off-by:
bravof
<
fbravo@whitestack.com
>
parent
19f2eafe
Pipeline
#2814
passed with stage
in 2 minutes and 18 seconds
Changes
46
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
1132 additions
and
0 deletions
+1132
-0
.gitmodules
.gitmodules
+6
-0
SOL004_hackfest_basic_vnf/ChangeLog.txt
SOL004_hackfest_basic_vnf/ChangeLog.txt
+5
-0
SOL004_hackfest_basic_vnf/Files/icons/osm.png
SOL004_hackfest_basic_vnf/Files/icons/osm.png
+0
-0
SOL004_hackfest_basic_vnf/Licenses/license.lic
SOL004_hackfest_basic_vnf/Licenses/license.lic
+201
-0
SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf
SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf
+14
-0
SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.yaml
SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.yaml
+63
-0
SOL007_hackfest_basic_ns/ChangeLog.txt
SOL007_hackfest_basic_ns/ChangeLog.txt
+5
-0
SOL007_hackfest_basic_ns/Files/icons/osm.png
SOL007_hackfest_basic_ns/Files/icons/osm.png
+0
-0
SOL007_hackfest_basic_ns/Licenses/license.lic
SOL007_hackfest_basic_ns/Licenses/license.lic
+201
-0
SOL007_hackfest_basic_ns/hackfest_basic_nsd.mf
SOL007_hackfest_basic_ns/hackfest_basic_nsd.mf
+12
-0
SOL007_hackfest_basic_ns/hackfest_basic_nsd.yaml
SOL007_hackfest_basic_ns/hackfest_basic_nsd.yaml
+21
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/ChangeLog.txt
charm-packages/SOL004_k8s_proxy_charm_vnf/ChangeLog.txt
+5
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Files/icons/osm.png
...m-packages/SOL004_k8s_proxy_charm_vnf/Files/icons/osm.png
+0
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Licenses/license.lic
...-packages/SOL004_k8s_proxy_charm_vnf/Licenses/license.lic
+201
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/actions.yaml
...04_k8s_proxy_charm_vnf/Scripts/charms/simple/actions.yaml
+54
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/config.yaml
...004_k8s_proxy_charm_vnf/Scripts/charms/simple/config.yaml
+41
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/install
...4_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/install
+65
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/start
...004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/start
+65
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/upgrade-charm
...proxy_charm_vnf/Scripts/charms/simple/hooks/upgrade-charm
+65
-0
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/libansible.py
...rm_vnf/Scripts/charms/simple/lib/charms/osm/libansible.py
+108
-0
No files found.
.gitmodules
View file @
0a393e16
...
...
@@ -70,3 +70,9 @@
[submodule "charm-packages/native_manual_scale_charm_vnf/charms/simple/mod/operator"]
path = charm-packages/native_manual_scale_charm_vnf/charms/simple/mod/operator
url = https://github.com/canonical/operator.git
[submodule "charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator"]
path = charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/operator
url = https://github.com/canonical/operator
[submodule "charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm"]
path = charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/mod/charms.osm
url = https://github.com/charmed-osm/charms.osm
SOL004_hackfest_basic_vnf/ChangeLog.txt
0 → 100644
View file @
0a393e16
1.0.0
- Package converted with OSM package migration tool.
SOL004_hackfest_basic_vnf/Files/icons/osm.png
0 → 100644
View file @
0a393e16
54.6 KB
SOL004_hackfest_basic_vnf/Licenses/license.lic
0 → 100644
View file @
0a393e16
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
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.
SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.mf
0 → 100644
View file @
0a393e16
vnfd_id: hackfest_basic-vnf
vnfd_product_name: hackfest_basic-vnf
vnfd_provider_id: OSM
vnfd_software_version: 1.0
vnfd_package_version: 1.0.0
vnfd_release_date_time: 2021-11-09T18:10:22.368088-03:00
compatible_specification_versions: 3.3.1
vnfm_info: OSM
Source: hackfest_basic_vnfd.yaml
Algorithm: SHA-512
Hash: 00f939cd8ea49e8dd215ec292c804b2622f1a100e4753e81def28df153186750d23031b8167566194d66459e163e10b2e59aa7b1fd313fcb125850b178a004ac
SOL004_hackfest_basic_vnf/hackfest_basic_vnfd.yaml
0 → 100644
View file @
0a393e16
vnfd
:
description
:
A basic VNF descriptor w/ one VDU
df
:
-
id
:
default-df
instantiation-level
:
-
id
:
default-instantiation-level
vdu-level
:
-
number-of-instances
:
1
vdu-id
:
hackfest_basic-VM
vdu-profile
:
-
id
:
hackfest_basic-VM
min-number-of-instances
:
1
ext-cpd
:
-
id
:
vnf-cp0-ext
int-cpd
:
cpd
:
vdu-eth0-int
vdu-id
:
hackfest_basic-VM
id
:
hackfest_basic-vnf
mgmt-cp
:
vnf-cp0-ext
product-name
:
hackfest_basic-vnf
sw-image-desc
:
-
id
:
ubuntu18.04
name
:
ubuntu18.04
image
:
ubuntu18.04
-
id
:
ubuntu18.04-aws
name
:
ubuntu18.04-aws
image
:
ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
vim-type
:
aws
-
id
:
ubuntu18.04-azure
name
:
ubuntu18.04-azure
image
:
Canonical:UbuntuServer:18.04-LTS:latest
vim-type
:
azure
-
id
:
ubuntu18.04-gcp
name
:
ubuntu18.04-gcp
image
:
ubuntu-os-cloud:image-family:ubuntu-1804-lts
vim-type
:
gcp
vdu
:
-
id
:
hackfest_basic-VM
name
:
hackfest_basic-VM
sw-image-desc
:
ubuntu18.04
alternative-sw-image-desc
:
-
ubuntu18.04-aws
-
ubuntu18.04-azure
-
ubuntu18.04-gcp
virtual-compute-desc
:
hackfest_basic-VM-compute
virtual-storage-desc
:
-
hackfest_basic-VM-storage
int-cpd
:
-
id
:
vdu-eth0-int
virtual-network-interface-requirement
:
-
name
:
vdu-eth0
virtual-interface
:
type
:
PARAVIRT
version
:
'
1.0'
virtual-compute-desc
:
-
id
:
hackfest_basic-VM-compute
virtual-cpu
:
num-virtual-cpu
:
"
1"
virtual-memory
:
size
:
"
1.0"
virtual-storage-desc
:
-
id
:
hackfest_basic-VM-storage
size-of-storage
:
"
10"
SOL007_hackfest_basic_ns/ChangeLog.txt
0 → 100644
View file @
0a393e16
1.0.0
- Package converted with OSM package migration tool.
SOL007_hackfest_basic_ns/Files/icons/osm.png
0 → 100644
View file @
0a393e16
54.6 KB
SOL007_hackfest_basic_ns/Licenses/license.lic
0 → 100644
View file @
0a393e16
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
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.
SOL007_hackfest_basic_ns/hackfest_basic_nsd.mf
0 → 100644
View file @
0a393e16
nsd_invariant_id: default-id
nsd_name: default-name
nsd_designer: OSM
nsd_file_structure_version: 1.0
nsd_release_date_time: 2021-11-09T18:10:30.117516-03:00
compatible_specification_versions: 3.3.1
Source: hackfest_basic_nsd.yaml
Algorithm: SHA-512
Hash: 7c46a2da0331a99685e5097a9e5c370dfabfebb4730989582da484f1f98783e6442ba9a8c56b5fb3f5195463d81b6a6a90caacc20eb710b1f4f12c65aac74d33
SOL007_hackfest_basic_ns/hackfest_basic_nsd.yaml
0 → 100644
View file @
0a393e16
nsd
:
nsd
:
-
description
:
Simple NS with a single VNF and a single VL
df
:
-
id
:
default-df
vnf-profile
:
-
id
:
'
1'
virtual-link-connectivity
:
-
constituent-cpd-id
:
-
constituent-base-element-id
:
'
1'
constituent-cpd-id
:
vnf-cp0-ext
virtual-link-profile-id
:
mgmtnet
vnfd-id
:
hackfest_basic-vnf
id
:
hackfest_basic-ns
name
:
hackfest_basic-ns
version
:
'
1.0'
virtual-link-desc
:
-
id
:
mgmtnet
mgmt-network
:
true
vnfd-id
:
-
hackfest_basic-vnf
charm-packages/SOL004_k8s_proxy_charm_vnf/ChangeLog.txt
0 → 100644
View file @
0a393e16
1.0.0
- Package converted with OSM package migration tool.
charm-packages/SOL004_k8s_proxy_charm_vnf/Files/icons/osm.png
0 → 100644
View file @
0a393e16
54.6 KB
charm-packages/SOL004_k8s_proxy_charm_vnf/Licenses/license.lic
0 → 100644
View file @
0a393e16
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
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.
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/actions.yaml
0 → 100644
View file @
0a393e16
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# 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.
##
touch
:
description
:
"
Touch
a
file
on
the
VNF."
params
:
filename
:
description
:
"
The
name
of
the
file
to
touch."
type
:
string
default
:
"
"
required
:
-
filename
# Standard OSM functions
start
:
description
:
"
Stop
the
service
on
the
VNF."
stop
:
description
:
"
Stop
the
service
on
the
VNF."
restart
:
description
:
"
Stop
the
service
on
the
VNF."
reboot
:
description
:
"
Reboot
the
VNF
virtual
machine."
upgrade
:
description
:
"
Upgrade
the
software
on
the
VNF."
# Required by charms.osm.sshproxy
run
:
description
:
"
Run
an
arbitrary
command"
params
:
command
:
description
:
"
The
command
to
execute."
type
:
string
default
:
"
"
required
:
-
command
generate-ssh-key
:
description
:
"
Generate
a
new
SSH
keypair
for
this
unit.
This
will
replace
any
existing
previously
generated
keypair."
verify-ssh-credentials
:
description
:
"
Verify
that
this
unit
can
authenticate
with
server
specified
by
ssh-hostname
and
ssh-username."
get-ssh-public-key
:
description
:
"
Get
the
public
SSH
key
for
this
unit."
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/config.yaml
0 → 100644
View file @
0a393e16
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# 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.
##
options
:
ssh-hostname
:
type
:
string
default
:
"
"
description
:
"
The
hostname
or
IP
address
of
the
machine
to"
ssh-username
:
type
:
string
default
:
"
"
description
:
"
The
username
to
login
as."
ssh-password
:
type
:
string
default
:
"
"
description
:
"
The
password
used
to
authenticate."
ssh-public-key
:
type
:
string
default
:
"
"
description
:
"
The
public
key
of
this
unit."
ssh-key-type
:
type
:
string
default
:
"
rsa"
description
:
"
The
type
of
encryption
to
use
for
the
SSH
key."
ssh-key-bits
:
type
:
int
default
:
4096
description
:
"
The
number
of
bits
to
use
for
the
SSH
key."
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/install
0 → 100755
View file @
0a393e16
#!/usr/bin/env python3
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# 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.
##
import
sys
sys
.
path
.
append
(
"lib"
)
from
charms.osm.sshproxy
import
SSHProxyCharm
from
ops.main
import
main
class
MySSHProxyCharm
(
SSHProxyCharm
):
def
__init__
(
self
,
framework
,
key
):
super
().
__init__
(
framework
,
key
)
# Listen to charm events
self
.
framework
.
observe
(
self
.
on
.
config_changed
,
self
.
on_config_changed
)
self
.
framework
.
observe
(
self
.
on
.
install
,
self
.
on_install
)
self
.
framework
.
observe
(
self
.
on
.
start
,
self
.
on_start
)
# Listen to the touch action event
self
.
framework
.
observe
(
self
.
on
.
touch_action
,
self
.
on_touch_action
)
def
on_config_changed
(
self
,
event
):
"""Handle changes in configuration"""
super
().
on_config_changed
(
event
)
def
on_install
(
self
,
event
):
"""Called when the charm is being installed"""
super
().
on_install
(
event
)
def
on_start
(
self
,
event
):
"""Called when the charm is being started"""
super
().
on_start
(
event
)
def
on_touch_action
(
self
,
event
):
"""Touch a file."""
if
self
.
model
.
unit
.
is_leader
():
filename
=
event
.
params
[
"filename"
]
proxy
=
self
.
get_ssh_proxy
()
stdout
,
stderr
=
proxy
.
run
(
"touch {}"
.
format
(
filename
))
event
.
set_results
({
"output"
:
stdout
})
else
:
event
.
fail
(
"Unit is not leader"
)
return
if
__name__
==
"__main__"
:
main
(
MySSHProxyCharm
)
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/start
0 → 100755
View file @
0a393e16
#!/usr/bin/env python3
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# 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.
##
import
sys
sys
.
path
.
append
(
"lib"
)
from
charms.osm.sshproxy
import
SSHProxyCharm
from
ops.main
import
main
class
MySSHProxyCharm
(
SSHProxyCharm
):
def
__init__
(
self
,
framework
,
key
):
super
().
__init__
(
framework
,
key
)
# Listen to charm events
self
.
framework
.
observe
(
self
.
on
.
config_changed
,
self
.
on_config_changed
)
self
.
framework
.
observe
(
self
.
on
.
install
,
self
.
on_install
)
self
.
framework
.
observe
(
self
.
on
.
start
,
self
.
on_start
)
# Listen to the touch action event
self
.
framework
.
observe
(
self
.
on
.
touch_action
,
self
.
on_touch_action
)
def
on_config_changed
(
self
,
event
):
"""Handle changes in configuration"""
super
().
on_config_changed
(
event
)
def
on_install
(
self
,
event
):
"""Called when the charm is being installed"""
super
().
on_install
(
event
)
def
on_start
(
self
,
event
):
"""Called when the charm is being started"""
super
().
on_start
(
event
)
def
on_touch_action
(
self
,
event
):
"""Touch a file."""
if
self
.
model
.
unit
.
is_leader
():
filename
=
event
.
params
[
"filename"
]
proxy
=
self
.
get_ssh_proxy
()
stdout
,
stderr
=
proxy
.
run
(
"touch {}"
.
format
(
filename
))
event
.
set_results
({
"output"
:
stdout
})
else
:
event
.
fail
(
"Unit is not leader"
)
return
if
__name__
==
"__main__"
:
main
(
MySSHProxyCharm
)
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/hooks/upgrade-charm
0 → 100755
View file @
0a393e16
#!/usr/bin/env python3
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# 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.
##
import
sys
sys
.
path
.
append
(
"lib"
)
from
charms.osm.sshproxy
import
SSHProxyCharm
from
ops.main
import
main
class
MySSHProxyCharm
(
SSHProxyCharm
):
def
__init__
(
self
,
framework
,
key
):
super
().
__init__
(
framework
,
key
)
# Listen to charm events
self
.
framework
.
observe
(
self
.
on
.
config_changed
,
self
.
on_config_changed
)
self
.
framework
.
observe
(
self
.
on
.
install
,
self
.
on_install
)
self
.
framework
.
observe
(
self
.
on
.
start
,
self
.
on_start
)
# Listen to the touch action event
self
.
framework
.
observe
(
self
.
on
.
touch_action
,
self
.
on_touch_action
)
def
on_config_changed
(
self
,
event
):
"""Handle changes in configuration"""
super
().
on_config_changed
(
event
)
def
on_install
(
self
,
event
):
"""Called when the charm is being installed"""
super
().
on_install
(
event
)
def
on_start
(
self
,
event
):
"""Called when the charm is being started"""
super
().
on_start
(
event
)
def
on_touch_action
(
self
,
event
):
"""Touch a file."""
if
self
.
model
.
unit
.
is_leader
():
filename
=
event
.
params
[
"filename"
]
proxy
=
self
.
get_ssh_proxy
()
stdout
,
stderr
=
proxy
.
run
(
"touch {}"
.
format
(
filename
))
event
.
set_results
({
"output"
:
stdout
})
else
:
event
.
fail
(
"Unit is not leader"
)
return
if
__name__
==
"__main__"
:
main
(
MySSHProxyCharm
)
charm-packages/SOL004_k8s_proxy_charm_vnf/Scripts/charms/simple/lib/charms/osm/libansible.py
0 → 100644
View file @
0a393e16
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# 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.
##
import
fnmatch
import
os
import
yaml
import
subprocess
import
sys
sys
.
path
.
append
(
"lib"
)
import
charmhelpers.fetch
ansible_hosts_path
=
"/etc/ansible/hosts"
def
install_ansible_support
(
from_ppa
=
True
,
ppa_location
=
"ppa:ansible/ansible"
):
"""Installs the ansible package.
By default it is installed from the `PPA`_ linked from
the ansible `website`_ or from a ppa specified by a charm config..
.. _PPA: https://launchpad.net/~rquillo/+archive/ansible
.. _website: http://docs.ansible.com/intro_installation.html#latest-releases-via-apt-ubuntu
If from_ppa is empty, you must ensure that the package is available
from a configured repository.
"""
if
from_ppa
:
charmhelpers
.
fetch
.
add_source
(
ppa_location
)
charmhelpers
.
fetch
.
apt_update
(
fatal
=
True
)
charmhelpers
.
fetch
.
apt_install
(
"ansible"
)
with
open
(
ansible_hosts_path
,
"w+"
)
as
hosts_file
:
hosts_file
.
write
(
"localhost ansible_connection=local"
)
def
create_hosts
(
hostname
,
username
,
password
,
hosts
):
inventory_path
=
"/etc/ansible/hosts"
with
open
(
inventory_path
,
"w"
)
as
f
:
f
.
write
(
"[{}]
\n
"
.
format
(
hosts
))
h1
=
"host ansible_host={0} ansible_user={1} ansible_password={2}
\n
"
.
format
(
hostname
,
username
,
password
)
f
.
write
(
h1
)
def
create_ansible_cfg
():
ansible_config_path
=
"/etc/ansible/ansible.cfg"
with
open
(
ansible_config_path
,
"w"
)
as
f
:
f
.
write
(
"[defaults]
\n
"
)
f
.
write
(
"host_key_checking = False
\n
"
)
# Function to find the playbook path
def
find
(
pattern
,
path
):
result
=
""
for
root
,
dirs
,
files
in
os
.
walk
(
path
):
for
name
in
files
:
if
fnmatch
.
fnmatch
(
name
,
pattern
):
result
=
os
.
path
.
join
(
root
,
name
)
return
result
def
execute_playbook
(
playbook_file
,
hostname
,
user
,
password
,
vars_dict
=
None
):
playbook_path
=
find
(
playbook_file
,
"/var/lib/juju/agents/"
)
with
open
(
playbook_path
,
"r"
)
as
f
:
playbook_data
=
yaml
.
load
(
f
)
hosts
=
"all"
if
"hosts"
in
playbook_data
[
0
].
keys
()
and
playbook_data
[
0
][
"hosts"
]:
hosts
=
playbook_data
[
0
][
"hosts"
]
create_ansible_cfg
()
create_hosts
(
hostname
,
user
,
password
,
hosts
)
call
=
"ansible-playbook {} "
.
format
(
playbook_path
)
if
vars_dict
and
isinstance
(
vars_dict
,
dict
)
and
len
(
vars_dict
)
>
0
:
call
+=
"--extra-vars "
string_var
=
""
for
k
,
v
in
vars_dict
.
items
():
string_var
+=
"{}={} "
.
format
(
k
,
v
)
string_var
=
string_var
.
strip
()
call
+=
'"{}"'
.
format
(
string_var
)
call
=
call
.
strip
()
result
=
subprocess
.
check_output
(
call
,
shell
=
True
)
return
result
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment