demo.git
2 years agovFW CNF fix for issue with config-deploy operation 60/120860/1
Lukasz Rajewski [Thu, 22 Apr 2021 17:01:23 +0000 (19:01 +0200)]
vFW CNF fix for issue with config-deploy operation

Issue-ID: INT-1868
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: Ia905c89b96f568bc362c0fd6f73bf0ec4c06212c

2 years agovFW CNF updates after integration tests 41/120341/3
Lukasz Rajewski [Thu, 8 Apr 2021 20:57:27 +0000 (22:57 +0200)]
vFW CNF updates after integration tests

Issue-ID: INT-1868
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I450ec3ef9ce9b8cbde29f3345777bb655d5719d1

3 years ago[HONOLULU] Update versions for honolulu 16/120316/1
morganrol [Thu, 8 Apr 2021 13:09:48 +0000 (15:09 +0200)]
[HONOLULU] Update versions for honolulu

move to 1.8

Issue-ID: INT-1888

Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: I62d5a65b25adcc9684b90d6bf224f07c275a567a

3 years ago[ADMIN] Add Illia Halych in INFO.yaml 75/120175/2
mrichomme [Mon, 5 Apr 2021 09:04:50 +0000 (11:04 +0200)]
[ADMIN] Add Illia Halych in INFO.yaml

Add Eli and cleanup the INFO.yaml file

Issue-ID: INT-1842
Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I0783927126ea8f441ebc8b4f639bf6fb25da902c

3 years agoReal vFW CNF config-assign and config-deploy 64/119764/11
Lukasz Rajewski [Wed, 24 Mar 2021 18:15:31 +0000 (19:15 +0100)]
Real vFW CNF config-assign and config-deploy

Implementation of vFW CNF config-assign and config-deploy with
utilization of CDS native components for configuration API

Change-Id: I016b186e1fcad0bf1285292f2e93e12a1d96b63e
Issue-ID: INT-1868
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
3 years agoImplementation of config-assign and config-deploy actions 55/119555/3
Lukasz Rajewski [Fri, 19 Mar 2021 16:50:37 +0000 (17:50 +0100)]
Implementation of config-assign and config-deploy actions

Implementation of config-assign and config-deploy actions

Issue-ID: INT-1868
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: Ibe61ea32bb1d0fbfc5396adf54c7d2fcbc7bbf30

3 years agoAdd cofig-assign and config-deploy to cds workflow 91/119091/8
Michał Grzesik [Wed, 10 Mar 2021 16:26:04 +0000 (17:26 +0100)]
Add cofig-assign and config-deploy to cds workflow

Add cofig-assign and config-deploy to cds workflow,
cloud region and vf params list updated,
exporting onap settings for onapsdk

Issue-ID: INT-1868
Signed-off-by: Michal Grzesik <michal.grzesik@orange.com>
Change-Id: I68acbc2ecedfafb4d2291707f5fef82e8feab831

3 years agoCheck orchestration status during instantiation and deletion vFW_CNF_CDS usecase 05/116505/4
Michal Chabiera [Tue, 22 Dec 2020 10:55:52 +0000 (11:55 +0100)]
Check orchestration status during instantiation and deletion vFW_CNF_CDS usecase

Check orchestration status during instantiation and deletion vFW_CNF_CDS usecase

Issue-ID: INT-1658
Signed-off-by: Michal Chabiera <michal.chabiera@orange.com>
Change-Id: Iffeda65393cea55a8108b91f282b7ee9d6e6f7c8

3 years agoAutomation scripts for vFW_CNF_CDS usecase 83/116183/7
Michal Chabiera [Mon, 7 Dec 2020 17:18:27 +0000 (18:18 +0100)]
Automation scripts for vFW_CNF_CDS usecase

Automation scripts for vFW_CNF_CDS usecase

Issue-ID: INT-1658
Signed-off-by: Michal Chabiera <michal.chabiera@orange.com>
Change-Id: I32ba9afe0ca95c5db66c6789756508a76a13f948

3 years agoAdd Lasse as Integration committer 87/115187/1
mrichomme [Fri, 20 Nov 2020 17:27:25 +0000 (18:27 +0100)]
Add Lasse as Integration committer

Issue-ID: INT-1788

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I3cecaa52c6bb85d424f76d807ce9248da4d6caaa

3 years agoCreate demo 1.7.0 for guilin 59/115159/1
mrichomme [Fri, 20 Nov 2020 09:24:13 +0000 (10:24 +0100)]
Create demo 1.7.0 for guilin

Issue-ID: INT-1785

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I8b766303968b96ca4338dd52dcb853a88c9cf810

3 years agovFW CNF CDS scripts update for native Helm support 48/114648/2
Lukasz Rajewski [Thu, 5 Nov 2020 21:55:13 +0000 (22:55 +0100)]
vFW CNF CDS scripts update for native Helm support

vFW CNF CDS scripts update for native Helm support

Change-Id: I34a1cc8dfb18e512edb6e2786984b683c34815e6
Issue-ID: INT-1658
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
3 years agoROBOT e2e test cases improvements for csar/zip tosca package validation in VNFSDK... 98/114498/1
Krzysztof Kuzmicki [Mon, 2 Nov 2020 15:46:23 +0000 (16:46 +0100)]
ROBOT e2e test cases improvements for csar/zip tosca package validation in VNFSDK and SDC Onbarding

Issue-ID: INT-1240

Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Change-Id: Ie62661a616b6d8d7ee4ffaa1a03ee644e3cdfe77

3 years agovFW CDS CNF CBA with native k8s profile upload 32/113732/3
Lukasz Rajewski [Fri, 9 Oct 2020 18:59:32 +0000 (20:59 +0200)]
vFW CDS CNF CBA with native k8s profile upload

vFW CDS CNF CBA with native k8s profile upload

Change-Id: Ic3357982af534ea261d4d617e050dc33bc339645
Issue-ID: INT-1658
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
3 years agoUpdate INFO.yaml 31/113031/2
mrichomme [Wed, 23 Sep 2020 08:34:02 +0000 (10:34 +0200)]
Update INFO.yaml

Issue-ID: INT-1724

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I7eb5026e772fc9f23bd4c3cb1e5fc56a150f5c73
Signed-off-by: mrichomme <morgan.richomme@orange.com>
3 years agoVNF Software Version parameter added to CDS Heat templates 93/111493/2
Lukasz Rajewski [Thu, 20 Aug 2020 21:24:25 +0000 (23:24 +0200)]
VNF Software Version parameter added to CDS Heat templates

VNF Software Version parameter added to CDS base heat templates.
The purpose is to give a possibility to set the value of the
software-version attribute in generic-vnf object in time of VNF
instantiation.

Change-Id: Ia8c6d446dd538fb8ee58e4504d62ac3f2edc71e6
Issue-ID: INT-1600
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
3 years agoUpdate pom files in master to 1.7.0-SNAPSHOT 70/109170/2
Marco Platania [Mon, 15 Jun 2020 17:20:52 +0000 (13:20 -0400)]
Update pom files in master to 1.7.0-SNAPSHOT

Issue-ID: INT-1625
Signed-off-by: Marco Platania <platania@research.att.com>
Change-Id: Ie7ebd34221170804bc4aec92b4628fbfe17a6596

3 years agoFix for missing VNFC rel information 64/109164/2
Lukasz Rajewski [Mon, 15 Jun 2020 15:01:09 +0000 (17:01 +0200)]
Fix for missing VNFC rel information

This patch adds workaround for missing
VNFC-VSERVER relation when VSERVER info
is created by SO heatbridge (instead robot)

Change-Id: I4d54f4bd1ac17193f5b1037bedbf1d00af9d0ac9
Issue-ID: SO-2983
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
3 years agoRemove endpoint-selector from Data Dictionary 96/107196/2
Samuli Silvius [Wed, 6 May 2020 05:08:51 +0000 (08:08 +0300)]
Remove endpoint-selector from Data Dictionary

According to cds bug fixed by https://gerrit.onap.org/r/c/ccsdk/cds/+/106128

Issue-ID: INT-1581

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I58727f7ac114e26c38f44cc33f35e9a54b0f0017

3 years ago[vFW_CNF_CDS] Update package with latest CDS/Policy changes 92/108192/1
Konrad Bańka [Mon, 25 May 2020 10:03:38 +0000 (12:03 +0200)]
[vFW_CNF_CDS] Update package with latest CDS/Policy changes

Rename csar directory with proper name.
Update CBA to refer to default naming policy.
Remove policy creating script/docs as it's no longer relevant.

Issue-ID: INT-1457
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I7d3b888ce073a88e6dfd41883a8853fbf7cb0539

3 years ago[vFW_CNF_CDS] Cleanup onboarding package content 32/107832/5
Konrad Bańka [Tue, 19 May 2020 06:08:19 +0000 (08:08 +0200)]
[vFW_CNF_CDS] Cleanup onboarding package content

Rename CSAR to onboarding package where mentioned.
This change doesn't contain CBA/Policy updates as they
need to be updated according to latest CDS config once
it is merged.

Issue-ID: INT-1457
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ia230b749fc080d4eaf9834d7d64723d74726a550

3 years agoFix lint and systemctl issues 68/108068/4
Brian Freeman [Thu, 21 May 2020 14:54:06 +0000 (14:54 +0000)]
Fix lint and systemctl issues

removed vFWCL_DANOS since it was repalced with shorter VFWCLDN

Issue-ID: INT-1566
Change-Id: I3d928795e903b584d4d6ca9f1bf631e692317ee8
Signed-off-by: Brian Freeman <bf1936@att.com>
3 years agoFixed secrets used for appc 64/107664/1
Lukasz Rajewski [Thu, 14 May 2020 08:16:37 +0000 (10:16 +0200)]
Fixed secrets used for appc

THe patch changes way how secrets are
resolved for appc after latest changes in
ONAP secrets policy.

Issue-ID: INT-1465
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I7f992477e612cb04eb3c4dd5dce64fa9c83d1258

3 years agoUpdate INFO.yaml 23/107523/1
mrichomme [Tue, 12 May 2020 07:20:16 +0000 (09:20 +0200)]
Update INFO.yaml

Issue-ID: INT-1587

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: Ic27fcf2d7d097a6e5eb8bc3e952c3aef93c1afba

3 years agoImprovements for new policy API 17/106817/7
Lukasz Rajewski [Tue, 28 Apr 2020 20:48:05 +0000 (22:48 +0200)]
Improvements for new policy API

Improvements in demo scripts for new
API for policy, including scripts preparing
OOF for interaction with Policy API

Change-Id: Ifd28f6b2941d23dcab6699a71c536d8534fa7cf5
Issue-ID: INT-1465
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
3 years agoROBOT e2e test cases improvements for csar/zip tosca package validation in VNFSDK... 10/107110/10
Krzysztof Kuzmicki [Tue, 5 May 2020 12:32:41 +0000 (14:32 +0200)]
ROBOT e2e test cases improvements for csar/zip tosca package validation in VNFSDK and SDC Onbarding

Issue-ID: INT-1240

Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Change-Id: If4d89b802a85241e66f38e010e8be0ce94a484e3

3 years agoCompress IP assignments 37/106037/2
Brian Freeman [Wed, 15 Apr 2020 17:48:47 +0000 (12:48 -0500)]
Compress IP assignments

Issue-ID: INT-1527
Change-Id: Iace03cdd6e79780c9df78b2648af3f476698c889
Signed-off-by: Brian Freeman <bf1936@att.com>
3 years agoAdd csar in binary list of .gitattributes 73/106873/3
mrichomme [Thu, 30 Apr 2020 07:06:46 +0000 (09:06 +0200)]
Add csar in binary list of .gitattributes

Issue-ID: INT-1572

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: Ic723acced29e0265c927d5bb0c4da0d243bed167
Signed-off-by: mrichomme <morgan.richomme@orange.com>
3 years agoUpload the csar file for vCPE integration 33/106733/2
zhaoliping123 [Tue, 28 Apr 2020 10:15:11 +0000 (18:15 +0800)]
Upload the csar file for vCPE integration

Issue-ID: VFC-1668
Change-Id: Ib34c7e180e6fb60760fca7cd7f99b6309d363b94
Signed-off-by: zhaoliping123 <zhaoliping@chinamobile.com>
3 years agoInitial VES for DANOS vRouter 09/106709/3
root [Mon, 27 Apr 2020 21:53:00 +0000 (21:53 +0000)]
Initial VES for DANOS vRouter

1. Create vpp_measurement_reporter that use DANOS configd query
   to retrieve statistics and libevel to transmit
2. Copy VES evel library to build a debian package under
   vpp_measurement_report
3. Add debian files to create a vpp_measurement_reporter + libevel
   debian package
4. Add debian install and systemctl start files
5. Add instruction to build VES reporter debian package (that will
   include libevel.so)
6. Add instructions to build DANOS ISO with VES reporter debian
   package and creating glance image

Issue-ID: INT-1566
Change-Id: If18f16525f07f1b6bae0fc105e0452263b4bf661
Signed-off-by: Brian Freeman <bf1936@att.com>
3 years agovFWDT tutorial fixes after integration tests 51/106651/2
Lukasz Rajewski [Sun, 26 Apr 2020 21:49:55 +0000 (23:49 +0200)]
vFWDT tutorial fixes after integration tests

Modification in test files, including configuration
and workflow files.

Change-Id: I6d9eaf4355a151fa20f1b5d4ea8a025cbcb3d70f
Issue-ID: INT-1465
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
4 years ago[vFW_CNF_CDS] Ensure binary files are treated correctly by git 78/104878/1
Konrad Bańka [Wed, 1 Apr 2020 15:03:24 +0000 (17:03 +0200)]
[vFW_CNF_CDS] Ensure binary files are treated correctly by git

Issue-ID: INT-1512
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Id768d6491059694a274e789b2389fe1865fae457

4 years agoROBOT e2e test cases improvements for csar/zip tosca package validation in VNFSDK... 64/104564/4
Krzysztof Kuzmicki [Fri, 27 Mar 2020 12:59:26 +0000 (13:59 +0100)]
ROBOT e2e test cases improvements for csar/zip tosca package validation in VNFSDK and SDC Onbarding

Issue-ID: INT-1240

Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Change-Id: Ia9641709bc5cecfb09304d52d03b516b676d472e

4 years agoHTTPS VES vLB,vLBMS and vFWs 09/104609/1
Brian Freeman [Fri, 27 Mar 2020 19:17:29 +0000 (14:17 -0500)]
HTTPS VES vLB,vLBMS and vFWs

vFWDT, vFW_HPA,vFW_NextGen,vLB,vLBMS

Issue-ID: INT-1319
Change-Id: I38c6115b0921cc6c709e5de3c33fcb743bf0c899
Signed-off-by: Brian Freeman <bf1936@att.com>
4 years agoMove vFW to HTTPS VES 91/104491/5
Brian Freeman [Thu, 26 Mar 2020 13:14:46 +0000 (08:14 -0500)]
Move vFW to HTTPS VES

Issue-ID: INT-1319
Change-Id: Ie100f919d162416676ce42a7fa785c8cef2dd917
Signed-off-by: Brian Freeman <bf1936@att.com>
4 years agoFix indentation issues within YAMLs 09/104509/1
Bartek Grzybowski [Thu, 26 Mar 2020 15:03:47 +0000 (16:03 +0100)]
Fix indentation issues within YAMLs

Fixes applied as reported by yamllint.

Change-Id: I5320d49799ecdd3ffbc8f9fbb8617554a709c247
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix spacing issues in YAML files in heat 96/104496/1
Bartek Grzybowski [Thu, 26 Mar 2020 13:23:02 +0000 (14:23 +0100)]
Fix spacing issues in YAML files in heat

Fixes applied as reported by yamllint.

Change-Id: I192de1f318c9aee58868807e4a9942b48b8b8e65
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix spacing issues in YAML files in tosca/ 95/104495/1
Bartek Grzybowski [Thu, 26 Mar 2020 13:22:39 +0000 (14:22 +0100)]
Fix spacing issues in YAML files in tosca/

Fixes applied as reported by yamllint.

Change-Id: Ie152fb8a1f5b61488be15cd81915decb2f806364
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix spacing issues in YAML files in tutorials/ 94/104494/1
Bartek Grzybowski [Thu, 26 Mar 2020 13:22:02 +0000 (14:22 +0100)]
Fix spacing issues in YAML files in tutorials/

Fixes applied as reported by yamllint.

Change-Id: I6f5ddce18c7a29bbbf3c973d1fd34ba308ec5616
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix spacing issues in YAML files in vnfs 93/104493/1
Bartek Grzybowski [Thu, 26 Mar 2020 13:20:56 +0000 (14:20 +0100)]
Fix spacing issues in YAML files in vnfs

Fixes applied as reported by yamllint.

Change-Id: I8bd30d49e728715fdc696bb984fbca842ac1c2b8
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix indentation issues as reported by pylint 38/104238/1
Bartek Grzybowski [Tue, 24 Mar 2020 12:09:34 +0000 (13:09 +0100)]
Fix indentation issues as reported by pylint

Change-Id: I96c57d08d0030b48a9377eb05c077e26241870a6
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix unused varbiales pylint warnings 34/104234/1
Bartek Grzybowski [Tue, 24 Mar 2020 11:11:29 +0000 (12:11 +0100)]
Fix unused varbiales pylint warnings

Change-Id: I3f76a82d276c75f20453a9306b4f9964d90b5179
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoDo not use `len(SEQUENCE)` to determine if a sequence is empty 33/104233/1
Bartek Grzybowski [Tue, 24 Mar 2020 09:53:33 +0000 (10:53 +0100)]
Do not use `len(SEQUENCE)` to determine if a sequence is empty

Change-Id: Iad6832e7b9d468bc8ce73cb728bb983941f7a61c
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoRemoving unused imports in python scripts 63/104163/1
Bartek Grzybowski [Mon, 23 Mar 2020 15:06:14 +0000 (16:06 +0100)]
Removing unused imports in python scripts

Removing according to pylint report.

Change-Id: I2296b923a71c53347afcd0eb11d1c07b1400570f
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix whitespace issues in Python files 54/104154/1
Bartek Grzybowski [Mon, 23 Mar 2020 13:42:04 +0000 (14:42 +0100)]
Fix whitespace issues in Python files

Change-Id: I7c98d1187c24b58471a822ec6f0fb9b0999f6f39
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoPretty print json files in heat/ 59/104059/2
Bartek Grzybowski [Fri, 20 Mar 2020 13:36:10 +0000 (14:36 +0100)]
Pretty print json files in heat/

Fixing json files to conform to linter rules.

Change-Id: Ia758a50adffb13889255511594aacc03f66f4e4b
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoPretty print json files in service_mapping/ 61/104061/2
Bartek Grzybowski [Fri, 20 Mar 2020 13:40:22 +0000 (14:40 +0100)]
Pretty print json files in service_mapping/

Fixing json files to conform to linter rules.

Change-Id: I2c0e6bf4df7cd921a4860570045bf26bc1ab6c5b
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoPretty print json files in preload_data/ 60/104060/2
Bartek Grzybowski [Fri, 20 Mar 2020 13:39:52 +0000 (14:39 +0100)]
Pretty print json files in preload_data/

Fixing json files to conform to linter rules.

Change-Id: I96d7f62152634cd63e8af76e56ab8fc89e766f74
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoPretty print json files in tutorials/ 58/104058/2
Bartek Grzybowski [Fri, 20 Mar 2020 13:35:39 +0000 (14:35 +0100)]
Pretty print json files in tutorials/

Fixing json files to conform to linter rules.

Change-Id: Ib71831d153f32133eef7deb95804e9d96240f5c7
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoPretty print json files in vnfs/ 57/104057/2
Bartek Grzybowski [Fri, 20 Mar 2020 13:34:13 +0000 (14:34 +0100)]
Pretty print json files in vnfs/

Fixing json files to conform to linter rules.

Change-Id: I88556796ebf7737bc82db1ab0675b943061c6354
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoFix unparsable json files 50/104050/2
Bartek Grzybowski [Fri, 20 Mar 2020 12:13:37 +0000 (13:13 +0100)]
Fix unparsable json files

Fixing json files that had been malformed and
had syntax issues.

Change-Id: I36f28d17eb8bbe8432f26785958d348092699336
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoAdd tox setup for linter verifiers 68/103968/3
Bartek Grzybowski [Thu, 19 Mar 2020 14:59:20 +0000 (15:59 +0100)]
Add tox setup for linter verifiers

Change-Id: I02a2e6f3bdd1efe09dee3d08946298d829650a9f
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
4 years agoSimplify CBA by removing unnecessary variables 31/103231/7
Konrad Bańka [Fri, 6 Mar 2020 08:24:23 +0000 (09:24 +0100)]
Simplify CBA by removing unnecessary variables

Change scope:
- demo_artifacts_version - default on vnf level, removed vf-module level
- install_script_version - removed
- *image_name - removed
- public_net_id - removed
- key_name - removed
- pub_key - removed
- *flavor_name - removed
- sec_group - removed
- nfc-naming-code - removed
- cloud_env - removed
- nexus_artifact_repo - removed
- *cidr - removed, where applicable
- *ip - removed, where applicable
- dcae* - moved to vnf level
- aic-cloud-region - removed on vf-module level
- vnf_name - removed on base-template level
- vf-module-type - removed
- vnfc-model-version - removed
- vnfc-model-invariant-uuid - removed
- vfccustomizationuuid - removed
- vf-module-id - removed from template result
- service-instance-id - removed from template result
- vnf_name - removed and vf-module level
- vf-module-model-customization-uuid - removed from template result
- vf-module-model-version - removed from template result
- vf-module-model-invariant-uuid - removed from template result
- vnf-model-customization-uuid - removed at vf-module-level
and few other minor tweaks including updating dataDict and enrichment

Issue-ID: INT-1260
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ica6073d0270da9d5ff0f0e544a9b329f66d9b5bb

4 years agoHelper script for tailing POD logs 97/103297/2
Samuli Silvius [Fri, 6 Mar 2020 17:29:20 +0000 (19:29 +0200)]
Helper script for tailing POD logs

Simple way of utilizing kubectl to collect or tail POD logs.
Supports tailing/collecting "kubectl logs" and any file content
inside the POD container.

Multiple PODs/containers and logs tailing/collecting started/collected
with single command. POD and logs are configured in tail_config file.

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I9e00e5f503fee2f86b75b1333973fd1569ae5aab

4 years agoProvide custom naming policy for vFW CNF usecase 46/102946/3
Konrad Bańka [Fri, 28 Feb 2020 10:21:22 +0000 (11:21 +0100)]
Provide custom naming policy for vFW CNF usecase

Issue-ID: INT-1457
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I9a5bc4ba6296800005bd0ed5cbc6c79b1064bdcd

4 years agoImprove CBA to derive variables from others on same level 04/103004/3
Konrad Bańka [Wed, 4 Mar 2020 14:26:47 +0000 (15:26 +0100)]
Improve CBA to derive variables from others on same level

Previously some variables required to be resolved for each vf-module
individually, by retrieving from MDSAL vnf entry, even though they
didn't differ between each other. Now CBA RA result has been modified to
provide such variables on the same level, by deriving their value from
other variables resolved on the same level (vnf/vf-module) by using sdnc
"unresolved-composite-data" capability.

Issue-ID: INT-1457
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I9d9134654d680cf1ea735577fb6d54a0fc0fd0b8

4 years agoK8s Profile mod on demand 02/102602/3
Lukasz Rajewski [Fri, 28 Feb 2020 14:24:52 +0000 (15:24 +0100)]
K8s Profile mod on demand

This change provides an example of
modificatioin of k8s profile on demand.
In here the ssh service of vPGN is
created on demand and user can decide
about the number of ssh exposed port

Change-Id: Ie734e4f832d6a07ff53a0f108aed74a43d325b22
Issue-ID: INT-1458
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
4 years agoProvide template of ssh service to be included by profiles 66/102466/4
Konrad Bańka [Thu, 27 Feb 2020 08:22:05 +0000 (09:22 +0100)]
Provide template of ssh service to be included by profiles

Issue-ID: INT-1457
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: If51f9debb204d9b5037ac38fafaef25de68cb260

4 years agoCorrect typo in selectors for helm deployments 65/102465/3
Konrad Bańka [Thu, 27 Feb 2020 08:17:06 +0000 (09:17 +0100)]
Correct typo in selectors for helm deployments

Issue-ID: INT-1260
Change-Id: Iaa95354bb29711841187630b017653b50957dbc2
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
4 years agoK8S Profile modification by CDS 89/102189/3
Lukasz Rajewski [Sun, 23 Feb 2020 17:24:00 +0000 (18:24 +0100)]
K8S Profile modification by CDS

This change implements the modification of K8s
profile by CDS. The script creates the content
of tar.gz file with profile base on the included
profile tempalte and template artifcts of the
profile. This version only builds the profile file.

Change-Id: If3aafdb660b6e63ebb33892f5e8593bd0b6be392
Issue-ID: INT-1458
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
4 years agoCreate complete Data Dictionary 24/102524/2
Samuli Silvius [Thu, 27 Feb 2020 19:59:51 +0000 (21:59 +0200)]
Create complete Data Dictionary

Added helper script to generate Data Dictionary
from enriched CBA model.
Generated initial DD.
Model still needs to be enriched and DD corrected if needed.

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I082d2ce3c84b0c0a953722259997f23717198129

4 years agoCorrect CBA package for vFW_CNF_CDS usecase 88/100588/17
Konrad Bańka [Fri, 24 Jan 2020 10:06:14 +0000 (11:06 +0100)]
Correct CBA package for vFW_CNF_CDS usecase

This fixes change helm and cba content to enable instantiation
with some workarounds. Data dictionary in this review is not
ready yet, as well as there are many workarounds within.

Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Issue-ID: INT-1260
Change-Id: I4833fa11772b7bd2b65d04f0d81ffad22570d309

4 years agoAPPC CDT Automation 95/101995/2
Lukasz Rajewski [Wed, 19 Feb 2020 14:14:25 +0000 (15:14 +0100)]
APPC CDT Automation

The patch modifies vFWDT configuration
scripts in order to automate the configuration
of APPC artifacts instead of CDT. As a result it
makes use case closer for CSIT automation

Change-Id: I5ab2785093515ee0b224c8f3e8a5d9eb600e52f9
Issue-ID: APPC-1731
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
4 years agoRemoved resolution-key from K8S profile upload 42/100742/2
Lukasz Rajewski [Fri, 24 Jan 2020 10:06:14 +0000 (11:06 +0100)]
Removed resolution-key from K8S profile upload

Removed resolution-key from K8S profile upload

Change-Id: If7c9106da4ca514d142c8bb898ac50630e41b577
Issue-ID: INT-1406
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
4 years agoAdd fd.io cert manually to demo VNFs 02/100502/1
Marco Platania [Mon, 20 Jan 2020 15:13:05 +0000 (10:13 -0500)]
Add fd.io cert manually to demo VNFs

Issue-ID: INT-1415
Signed-off-by: Marco Platania <platania@research.att.com>
Change-Id: Icd03fa50868fe6f8ab64e6b6a0b3baff1f1f574b

4 years agoAdditional missing changed for CNF parameter resolution. 31/100131/6
Samuli Silvius [Thu, 9 Jan 2020 13:24:56 +0000 (15:24 +0200)]
Additional missing changed for CNF parameter resolution.

Accidentally missed adding "vf-module-model-invariant-uuid" and "vf-module-model-version"
to vf-modules mappings for resolution in previous commit.

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I0a47027e73284b4b0ae0a1f0ce18e45d6b2d9142

4 years agoK8s Profile Upload 68/99968/3
Lukasz Rajewski [Wed, 1 Jan 2020 22:09:26 +0000 (23:09 +0100)]
K8s Profile Upload

Modification of vFW CNF CBA package to upload
K8s profile automatically just after resource
assigment phase. Profile is created for each vf-module
and in this version only upload of static profile is
possible. Profile files must be included in the CBA in
Templates/k8s-profiles folder. Profile file must be valid
tar.gz file accepted by multicloud-k8s plugin.

Change-Id: I30c268e9867fbb86d997b2091ce2eed204a7df2a
Issue-ID: INT-1406
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
4 years agoCDS Blueprint for vFW K8s Use Case 03/99203/8
Samuli Silvius [Thu, 5 Dec 2019 12:34:48 +0000 (14:34 +0200)]
CDS Blueprint for vFW K8s Use Case

Introduce blueprint changes on top of latest
vFW demo to also support multicloud/K8s plugin
integration.

This commit brings resource resolution part for
k8s related parameters that are enough to instantiate
CNF defined by Helm charts in multicloud/k8s plugin.

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I783e364a201cda25ea812d83795ae2a4be71def9

4 years agovFW Upgrade Workflow 84/99984/1
Lukasz Rajewski [Wed, 1 Jan 2020 13:39:09 +0000 (14:39 +0100)]
vFW Upgrade Workflow

Continuation of changes for migiration of vFW DT
use case to vFW DT & Upgrade Use case. This patch contains
complete and final changes in the workflow script like
upgrade, lock, unlock actions. The workflow was also switched
to use latest APPC VNFC Ansible support feature. Logging of
LCM execution statistics also was added.

Change-Id: Iba744cd485eb2460951019fb2a6c5bce5d3e37b1
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Issue-ID: INT-1278

4 years agoFix Bartek and Marcin ID 49/99749/1
mrichomme [Wed, 18 Dec 2019 09:45:11 +0000 (10:45 +0100)]
Fix Bartek and Marcin ID

Issue-ID: INT-1386

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I34b6e5d1bb92c7dca57d634406810829fecda6b3

4 years agoAdd Bartek, Marcin and Eric as Integration committers 79/99379/1
mrichomme [Tue, 10 Dec 2019 07:38:46 +0000 (08:38 +0100)]
Add Bartek, Marcin and Eric as Integration committers

Issue-ID: INT-1386

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I90f55034706b834068eeec2be0f53f6efeab2f9b

4 years agoRefactor FIXMEs in vFW_CDS_CNF use case 63/97963/5
Konrad Bańka [Tue, 5 Nov 2019 14:25:09 +0000 (15:25 +0100)]
Refactor FIXMEs in vFW_CDS_CNF use case

Issue-ID: INT-1259
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ia834019f3c1564e660036047864f74a7477273aa

4 years agoInitial CDS blueprint for vFW CNF demo 96/98996/1
Samuli Silvius [Mon, 2 Dec 2019 09:05:52 +0000 (11:05 +0200)]
Initial CDS blueprint for vFW CNF demo

This commit brings vFW demo CDS CBA model
from cds git repo as "unmodified" to start CNF demo
based on normal vFW CDS model.

The aim is also later to move CDS models out from CDS
git repo and place all into demo repository.

This commit is directly based on gerrit patch (not yet merged)
https://gerrit.onap.org/r/c/ccsdk/cds/+/96920 and Change-Id:
Id13b0ac2bb0889539faa31174cfdb8ab31588509

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I32ce84a25c8abc03fa9e21474b250b0575071e7b

4 years agoRemove Gary from the committer list 51/98751/1
mrichomme [Fri, 22 Nov 2019 07:39:11 +0000 (08:39 +0100)]
Remove Gary from the committer list

mail received from Gary on the 2019/11/21

Issue-ID: INT-1386

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: If4244371ddce70512bc670e1a2604f269cfabf43

4 years agoFirst working draft of kafka for inference app 36/97836/4
Rajamohan Raj [Fri, 1 Nov 2019 00:30:30 +0000 (00:30 +0000)]
First working draft of kafka for inference app

Created a python based inference app which can query a given metrics for
a given duration from kafka topic.
Consumer runs on separate thread and doesnt interfere with the main app.

Issue-ID: ONAPARC-528
Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com>
Change-Id: Ic84ea137b134385246bf11dee2ed6d34b593b956

4 years agoRemote Write Config and Filter operator 99/98199/3
Dileep Ranganathan [Fri, 8 Nov 2019 19:26:47 +0000 (11:26 -0800)]
Remote Write Config and Filter operator

Added support for Kafka Remote writer

Issue-ID: ONAPARC-393
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I46555a15b0f326ffcd305d28e82d244c86a34644

4 years agoAdd/update/delete PrometheusRemoteEndpoint CR 78/97578/12
Srivahni [Thu, 24 Oct 2019 21:08:58 +0000 (14:08 -0700)]
Add/update/delete PrometheusRemoteEndpoint CR

PrometheusRemoteEndpoint CR when applied, a remote write endpoint
is added/updated/deleted in prometheus.

Issue-ID: ONAPARC-393
Signed-off-by: Srivahni <srivahni.chivukula@intel.com>
Change-Id: I8cdc0b673b35be3457a2b12c6769cd3cf62ac6c5

4 years agoHelm charts for Prometheus Kafka Remote Writer 38/97838/3
Dileep Ranganathan [Fri, 1 Nov 2019 03:04:21 +0000 (20:04 -0700)]
Helm charts for Prometheus Kafka Remote Writer

Added Helm charts for prom-kafka-writer micro service.
Removed older kafka adapter due to inflexibility.

Issue-ID: ONAPARC-392
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I6f8e33a5e096c6b88badb29718e1e7ce126889fd

4 years agoPrometheus Kafka Writer Microservice 34/97834/4
Dileep Ranganathan [Thu, 31 Oct 2019 22:46:37 +0000 (15:46 -0700)]
Prometheus Kafka Writer Microservice

This patch implents Prometheus to remote Kafka Writer Microservice
Added sample day-2 config to configure prometheus

PS4: Fixed Review comments

Issue-ID: ONAPARC-393
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I0bc77175593a165effd7bb1cb4802c988a5ef4ec

4 years agoHDFS-WriterApp-Fixed all the code review comments 35/97835/3
Rajamohan Raj [Thu, 31 Oct 2019 23:51:29 +0000 (23:51 +0000)]
HDFS-WriterApp-Fixed all the code review comments

Fixed all the code review comments by Kiran

1. Implemented a boolean channel instead of empty struct channel for signal, use WaitGroup
to ensure all writers finish cleanup.
2. Introduce JSON tags for configs
4. remove all panic and fatalf code to ensure that the app doesnt crash anytime.
5. remove unneccessary hdfsWriter null checks.
        6.remove the 'run' variable used in the infinite loop, replaced with 'return'

Issue-ID: ONAPARC-453
Change-Id: Ic77c59dc75a8898a3cf34999850e6687d40e7faa
Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com>
4 years agoProvide vFW CNF use case csar content 09/97409/5
Konrad Bańka [Mon, 21 Oct 2019 09:04:31 +0000 (11:04 +0200)]
Provide vFW CNF use case csar content

Issue-ID: INT-1259
Change-Id: I0bcd85725e7f102bdcdf813db0c0260526b5807d
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
4 years agoUpdate INFO.yaml 98/97698/1
mrichomme [Tue, 29 Oct 2019 16:54:34 +0000 (17:54 +0100)]
Update INFO.yaml

Issue-ID: INT-1349

Change-Id: I94c20e0cef8f0a3f0adeaf14920601181bc970d8
Signed-off-by: mrichomme <morgan.richomme@orange.com>
4 years agoAdding Istio installtion helm charts 89/97089/3
Pramod [Tue, 15 Oct 2019 00:47:21 +0000 (17:47 -0700)]
Adding Istio installtion helm charts

Issue-ID: ONAPARC-521
Signed-off-by: Pramod <pramod.raghavendra.jayathirth@intel.com>
Change-Id: I1f74190664d59465319bff77d65282a2437ade4d

4 years agoHDFSWriter microservice working copy 90/97090/2
Rajamohan Raj [Tue, 15 Oct 2019 00:48:18 +0000 (00:48 +0000)]
HDFSWriter microservice working copy

Issue-ID: ONAPARC-453
Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com>
Change-Id: I11c91b642e466763c1ca6f5734bf81fb260e2b39

4 years agoChange NodePort to ClusterIP in coll, promOper pkg 88/97088/1
Srivahni [Mon, 14 Oct 2019 21:35:11 +0000 (14:35 -0700)]
Change NodePort to ClusterIP in coll, promOper pkg

Issue-ID: ONAPARC-393
Signed-off-by: Srivahni <srivahni.chivukula@intel.com>
Change-Id: Ica0be8d255074b78dede3fd3b0045f41fde02136

4 years agopass server id to preload so that it passes 74/96974/1
DR695H [Fri, 11 Oct 2019 20:07:10 +0000 (16:07 -0400)]
pass server id to preload so that it passes

Issue-ID: INT-1328
Change-Id: I2a00c04b0006c0c74e57e261bb753868079b3d4d
Signed-off-by: DR695H <dr695h@att.com>
4 years agoAdded Istio config for multicluster connectivity 74/96774/2
Dileep Ranganathan [Wed, 9 Oct 2019 04:31:42 +0000 (21:31 -0700)]
Added Istio config for multicluster connectivity

1. Collection package
2. Kafka
3. M3DB

Issue-ID: ONAPARC-466
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I3ef5722f207a930437ddc7c01e22609772f97865

4 years agoAdd Istio connectivity for Services below 44/96644/8
Pramod [Sat, 5 Oct 2019 00:23:19 +0000 (17:23 -0700)]
Add Istio connectivity for Services below

1. Grafana
2. Prometheus
3. Minio (Istio ServiceEntry Added)

Issue-ID: ONAPARC-511
Signed-off-by: Pramod <pramod.raghavendra.jayathirth@intel.com>
Change-Id: I2cb21c18fde6ecb431fa7f407ce5e13ab31fc910

4 years agoCollectd Operator Unit Tests 70/96770/2
Dileep Ranganathan [Wed, 9 Oct 2019 00:06:22 +0000 (17:06 -0700)]
Collectd Operator Unit Tests

Added unit tests for Collectd operator.

Issue-ID: ONAPARC-461
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: Ib50c16eaefc661e077d3477cbe8f2e4e62bbda80

4 years agoFix vVG preload 00/96700/1
Brian Freeman [Mon, 7 Oct 2019 21:36:51 +0000 (16:36 -0500)]
Fix vVG preload

Issue-ID: INT-1316
Change-Id: Ib7cbe7b0fc3fb972658a28175d2f1080f762775d
Signed-off-by: Brian Freeman <bf1936@att.com>
4 years agovFW DT tutorial improvements 06/96506/2
Lukasz Rajewski [Wed, 2 Oct 2019 11:01:54 +0000 (13:01 +0200)]
vFW DT tutorial improvements

- use of TLS for APPC
- vFW Upgrade workflow
- Help information for workflow
- script for configuration of workflow
- script for upgrade of vFW VMs to Upgrade demo

Change-Id: I26136ec20569c9c02abb1644c6e40b4733d8f5ea
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Issue-ID: INT-751

4 years agoAdded Daemonset Status predicate 51/96251/3
Dileep Ranganathan [Wed, 25 Sep 2019 21:37:41 +0000 (14:37 -0700)]
Added Daemonset Status predicate

Added Daemonset Status predicate to optimize watch on DS.
Minor fixes on status update for the controllers by coalescing status
and CR update together.

Issue-ID: ONAPARC-461
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Change-Id: I2a56f0b93c2d7a56b9e8149c41f8c6f22be86ef1

4 years agovFW DT tutorial improvements 81/96281/1
Lukasz Rajewski [Thu, 19 Sep 2019 08:24:20 +0000 (10:24 +0200)]
vFW DT tutorial improvements

- Fixed workflow script for osdf request
- ansible_inventory file generation added
- Licence for upload policy script

Change-Id: Ia46d19750569f649ce12dcdb49571299d87d8fee
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Issue-ID: INT-751
(cherry picked from commit e659e3afec2f3987d071510efe63e72374ef1a88)

4 years agoUpdated README 99/96099/1
Srivahni [Fri, 20 Sep 2019 20:26:39 +0000 (13:26 -0700)]
Updated README

Issue-ID: ONAPARC-393
Signed-off-by: Srivahni <srivahni.chivukula@intel.com>
Change-Id: Ic6578a4b0484b22109bd5a385f0917db8cff14f5

4 years agoEnable/disable grafana and visualization-operator 40/96040/3
Srivahni [Thu, 19 Sep 2019 19:25:50 +0000 (12:25 -0700)]
Enable/disable grafana and visualization-operator

Enable or disable grafana and visualization-operator
from values.yaml

Issue-ID: ONAPARC-393
Signed-off-by: Srivahni <srivahni.chivukula@intel.com>
Change-Id: I28599c497fc247ec6d9fbfb9e0449d1b0f736d3e

4 years agoBump poms and heat envs to 1.6.0-SNAPSHOT 16/95916/1
Marco Platania [Wed, 18 Sep 2019 13:24:10 +0000 (09:24 -0400)]
Bump poms and heat envs to 1.6.0-SNAPSHOT

Issue-ID: TEST-216
Signed-off-by: Marco Platania <platania@research.att.com>
Change-Id: Ie69b696d3c8b8bee726e092c16c33e4a68d4ce2d

4 years agobumping version to 1.6 of demo repo for frankfurt 51/95851/1
DR695H [Tue, 17 Sep 2019 18:37:51 +0000 (14:37 -0400)]
bumping version to 1.6 of demo repo for frankfurt

Issue-ID: TEST-216
Change-Id: Iba623edc166d8e06f385ba27b6b298a2c3ac1f94
Signed-off-by: DR695H <dr695h@att.com>
4 years agovFW DT tutorial improvements 38/95638/2
Lukasz Rajewski [Tue, 10 Sep 2019 11:30:53 +0000 (13:30 +0200)]
vFW DT tutorial improvements

- Improvements in the workflow script to use OSDF request
- policy types added
- policy rules added
- script to upload policies added

Change-Id: I61e2bf3bbb10ca45088e989bbd801ec9ca439ae3
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Issue-ID: INT-751

4 years agoFix Honeycomb installation in vDNS VM 75/95575/1
Marco Platania [Thu, 12 Sep 2019 13:08:37 +0000 (09:08 -0400)]
Fix Honeycomb installation in vDNS VM

Issue-ID: INT-853
Signed-off-by: Marco Platania <platania@research.att.com>
Change-Id: I8dd1cde406836de417fc7e1fabdf7b89d18b7fd2

4 years agoupdate README for visualization-operator image 13/95413/1
Srivahni [Tue, 10 Sep 2019 19:07:05 +0000 (12:07 -0700)]
update README for visualization-operator image

Issue-ID: ONAPARC-393
Signed-off-by: Srivahni <srivahni.chivukula@intel.com>
Change-Id: I6a2561cedd7958c6f262a3a3568d20992af1b69f