Fixed templating of values in k8s components

Fixed templating of values in k8s components

Issue-ID: CCSDK-3265
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I31a48078c972d9de5b9d1f40c29df2b3b4bbbde6

Fixed bug when k8s profile is created for default k8s version

Fixed bug when k8s profile is created for default k8s version

Issue-ID: CCSDK-3239
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: If62352774f3ffd4825341668c5c7efcb207c118a

Added missing elements of starter dictionary for CNF CBA

Added missing elements of starter dictionary for CNF CBA

Issue-ID: CCSDK-3211
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: Ib0ae251e26ccfab08e9c402d9e22bf5e9af29109
(cherry picked from commit 7f858b082287017c2f28b7fac03476c5f761a517)

CDS add vFW Use Case from Integration project

Issue-ID: DOC-698
Change-Id: I838e90d4f229dcf544117146d72dfd1af193dfb4
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit ca623d61e94bc70c163f1839dae66a623af4ce3a)

add toggle variable ansible fire failure to awx function

-add logs output when it fails

Issue-ID: CCSDK-2366

Signed-off-by: Eltanany Shaaban <shaaban.eltanany.ext@orange.com>
Change-Id: Ie1a122865be541a45de157ab3afa9e426d1defb4
(cherry picked from commit 81deaed80b00c7e09e1c8a962f75d9e29ae6c305)

add toggle variable ansible fire failure to awx function

Issue-ID: CCSDK-2366

Signed-off-by: Eltanany Shaaban <shaaban.eltanany.ext@orange.com>
Change-Id: I42b757c206c6d420ffa289cbe9e6c2b4dbf22b20
(cherry picked from commit fffa390c47e265c84d5bc755f480cb6d7974d4c5)

Merge "CDS API reference add bootstrap API" into guilin

Merge "API reference add link for doc project" into guilin

Merge "CDS Api reference add index, template, first APIs" into guilin

Merge "PNF Simulator netopeer2 issue fixed" into guilin

Merge "PNF simulator guide fix postman collections, typos" into guilin

Merge "PNF Simulator guide remove scripts and CBAs from guide. Remove all steps (dd, enrichment, publish) which are executed automatically by bootstrap now." into guilin

Merge "Guide Running CDS bp processor enhancements" into guilin

Merge "Refactoring docs" into guilin

Merge "PNF Simulator guide add unenriched CBA" into guilin

Merge "Updating doc references" into guilin

Merge "PNF Simulator guide (typos, explanations, postman)" into guilin

Merge "PNF Simulator Guide fix typos + add Postman" into guilin

Merge "PNF Simulator Guide: Init version without Postman" into guilin

Merge "Fix directory + tabs 'running bp processor in IDE'" into guilin

Merge "Refactoring and fixing Docs" into guilin

Merge "Refactoring Docs" into guilin

Merge "Support for generic URL for mount, Put, Get added" into guilin

CDS API reference add bootstrap API

Issue-ID: CCSDK-2992
Change-Id: Ia765775f7340700af980b0f91ebbc7cfbde28d3a
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit 86c0b5d57b75bc80f8219e5b32bd7e7b8c9c0527)
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>

API reference add link for doc project

Issue-ID: CCSDK-2992
Change-Id: Id7e4fc5cc61d5a13043adc54e94ca30554ec25b2
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit 014653e4fa0656b937d71d3c963fc524789ff10d)

CDS Api reference add index, template, first APIs

Issue-ID: CCSDK-2992
Change-Id: Iad8524cce702deb7f35650b9bd69b6690c0ecc6d
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit b1da7d99a9976016dedf6ff53a526b51de646c9c)

PNF Simulator netopeer2 issue fixed

Issue-ID: CCSDK-2970
Change-Id: I5f446495b85a15b8c6cc3c62b8e2e8e3792cc067
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit b31e01699bec4d752687690d0663865df6680796)

PNF simulator guide fix postman collections, typos

Issue-ID: CCSDK-2970
Change-Id: I22c576cae3b1ad69c3dcc117f9ede33a0c578cb7
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit 16ec88e1a6fbd9ea1e9ab51c908db87b595e10df)

PNF Simulator guide remove scripts and CBAs from guide.
Remove all steps (dd, enrichment, publish) which are executed
automatically by bootstrap now.

Issue-ID: CCSDK-2848
Change-Id: I4de4b7f4dd4da78b7b04f2292d8e9ebffeb541bf
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit fac42ccc0046183b5cab827caf05f0b540839965)

Guide Running CDS bp processor enhancements

Issue-ID: CCSDK-2640
Change-Id: I348f022b6e4d9068401bee3492dab708189cfce0
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit 4fe1cfb147e98cde707bb10c33cda7d4370a54a9)

Refactoring docs

Issue-ID: CCSDK-2916
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ide8d830bc5cfe223752f81b35d2f09a5759f5aa2
(cherry picked from commit 83c0cd2c078f89a386701b7f8e680fd3fc70ecfd)

PNF Simulator guide add unenriched CBA

Issue-ID: CCSDK-2848
Change-Id: I51c41a77f087609aed112fc562cd361188019873
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit 2798e38a91475a7853f5c66840bf312f82ee9525)

Updating doc references

Issue-ID: CCSDK-2846
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ia32c855dc48549a50933849a260e3d4d86b98adf
(cherry picked from commit cef859c192e84d61f2e98afc6f208772c1ac4699)

PNF Simulator guide (typos, explanations, postman)

Issue-ID: CCSDK-2848
Change-Id: I40106b019e8a81065817137ffdf9c7de7adc97aa
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit abfdc076229e446757cfe11fcff757aa84ca426d)

PNF Simulator Guide fix typos + add Postman

Issue-ID: CCSDK-2848
Change-Id: I42f1a5213f959b5ba3eed91c3984c8231c03dc0b
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit ebd1fbd630fe6c978335f185c7a49c9b7a95e699)

PNF Simulator Guide: Init version without Postman

Issue-ID: CCSDK-2848
Change-Id: I15b5d38cf6c412b5fbee4a94565de13c57b11e15
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit 0f29c1c861538c19fd8550610ecb6cd41d16cdbc)

Fix directory + tabs 'running bp processor in IDE'

Issue-ID: CCSDK-2846
Change-Id: I7369bb2678b7bf557249c03428f9f7d4deb0f5da
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>
(cherry picked from commit 1863a7c6e7a6e45be6fee13b0dcfbbdbc914df03)

Refactoring and fixing Docs

Issue-ID: CCSDK-2846
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I67b3270a2052a7f6bc878ba010011f01cb348192
(cherry picked from commit 51e7c12ccd4889cea181d92b368e1b74622ac769)

Refactoring Docs

Issue-ID: CCSDK-2846
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I34e469deb914fc4e452159a2c3419270f8eb97bc
(cherry picked from commit f1aafc40ad8f15b61faa3631e5a56fcf7c34bf49)

Release version 1.0.3 of CDS dockers

Release version 1.0.3 of docker images to pick up keytool fix.

Issue-ID: CCSDK-2914
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I4194714c5fdd26f0a93913e9fc1d8d5176510c9c

Release version 1.0.3 of CDS maven artifacts

Release version 1.0.3 of maven artifact to pick up keytool fix.

Issue-ID: CCSDK-2914
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ia6d4f446368e6ea53e7c647c17aaf5379a2c2283

Support for generic URL for mount, Put, Get added

Issue-ID: CCSDK-2993
Signed-off-by: tragait <rahul.tyagi@est.tech>
Change-Id: I4061d6ba5084806c0a14b137e169f73cdd68a588

Fix keytool invocation

Fixed 2 issues with keytool invocation in blueprints-processor start script:
1) removed duplicate '-import'
2) corrected path to cacerts file

Issue-ID: CCSDK-2914
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Id454ebca87811bb9c229ca3145148a7c7a93950b
(cherry picked from commit eda1329f854994ed8d4fba11a05a3f33b7bace86)

Release 1.0.2 docker container

Release version 1.0.2 of docker containers and roll to next Guilin
snapshot version

Issue-ID: CCSDK-2973
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Iba1211b81f4d0e59fd7cdf8a37b38a15dae3e926

Release 1.0.2 version of maven artifacts

Release 1.0.2 version of maven artifacts

Issue-ID: CCSDK-2973
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I80c6fdc0171a32ab3de56a26f2ad4827b11c4e5f

Remove URI encoding in BlueprintWebClientService

Malformed uri's should be handled by resource resolution in the cba

Issue-ID: CCSDK-2980
Change-Id: I5c1cf97519a882ff5cf99e9850c65df9ba6d9c36
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

Roll to next snapshot version

Roll to next snapshot version

Issue-ID: CCSDK-2973
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I55f7dfdc8102a4cb7ff2a77df20cc5a3905e524e

Release version 1.0.1 of CDS docker containers

Release Guilin RC1 version of CDS docker containers

Issue-ID: CCSDK-2931
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I825108940a34bf6b61fc40858e9240b4c79186e5

Release version 1.0.1 of CDS maven artifacts

Release version 1.0.1 of CDS maven artifacts

Issue-ID: CCSDK-2931
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I21de8be280f0d9af7bc8d681678f93db4b882933

5G Core Network Service CBA package upload

As part of the 5G slicing use case, the core NSSMF shall be instantiating a 5G core service which typically would comprise of AMF, SMF and UPF CNFs.
Performing day 0, day 1 and day 2 configurations

Change-Id: Ie7ebd34221170804bc4aec92b4628fbfe17a6500
Issue-ID: CCSDK-2919
Signed-off-by: ThamlurRaju <TR00568434@TechMahindra.com>
(cherry picked from commit d7e2885241aed5012bbd33ccc8b585b7d6f9b74b)

Update AAI endpoints to /aai/v21

 - Update all /aai/v14 references to /aai/v21 to resolve certificate
   problems in CDS when trying to resolve attribute values with aai-data source

Issue-ID: CCSDK-2914
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I6b150348b66e93b3d08ceaa49fa997d531ddb0e4
(cherry picked from commit bd6a6482f87626b4f1e49aa12e36e41a2e140168)

Cleaning up POM's

Issue-ID: CCSDK-2916
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ibf94c2ab1467c3ae113cc36be6b82ba075b0ff1a

Fixed k8s profile upload for source with tar.gz file

Fixed k8s profile upload for source with tar.gz file
Change was tested with CBA https://gerrit.onap.org/r/c/demo/+/113732

Change-Id: I08aa834cc4fedaf77b4c660ec16dea930dade588
Issue-ID: CCSDK-2899
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
(cherry picked from commit e7396afde23c4d335a097fa02bcae5f47a4ca6ed)

Merge "Add restconf-executor dependency to test-blueprint-kotlin-parent" into guilin

Merge "Fix service blueprints" into guilin

Add restconf-executor dependency to test-blueprint-kotlin-parent

Issue-ID: CCSDK-2862
Change-Id: I9b13ba3633b5901cede831cf5a8a394e7c669c81
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
(cherry picked from commit 0c7caeb96cd78c5e74e98c5c4077cade04d0d6ff)

Fix service blueprints

Blueprints were failing enrichment. Cba's were referencing requirement
restconf-connection which is not defined in component-netconf-executor.

Added new capability for restconf and fixed referencing

Issue-ID: CCSDK-2859
Change-Id: I13f8800ea5fad9daed8a8b7b81cc3649efbebbc9
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
(cherry picked from commit 919a7aa6ecbb06a4d04afba280202bdedef0eb52)

Fix resolution of keyIdentifiers

Issue-ID: CCSDK-2875
Change-Id: Ie089ee7f186f74691556f65a52fbaa7c6c165061
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

Do not install certs in docker image

Updated docker config to no longer install certificates in docker image.
Instead, in kubernetes env, they will be installed as secrets in oom.
In docker-compose env, certs will be an external mount.

Issue-ID: CCSDK-2519
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Id67e16e72d2cb7d0c9a1d88fdcff544d86ca2708
(cherry picked from commit 3b346af513694c07a3cb57734c8b881677c595f6)

Roll to next Guilin snapshot

Roll to next Guilin snapshot version

Issue-ID: CCSDK-2742
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I11095f5353b285b5f349c7599b2469b72c6a907f

Merge "Enabling Code Formatter"

Enabling Code Formatter

Code Formatter was turned off due to java 11 migation

Issue-ID: CCSDK-2852
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I3d02ed3cc7a93d7551fe25356512cfe8db1517d8

Release Guilin M4 dockers

Release M4 docker containers for ccsdk/cds repo

Issue-ID: CCSDK-2742
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ia46d3902e72b3a8b28cd4b441c8a3582e59b8341

Release Guilin M4 maven artifacts

Release M4 maven artifacts for ccsdk/cds repo

Issue-ID: CCSDK-2742
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Iff26d7cbb2e9b58cb7048bb3c037a247bf7e8fb1

Updating README.md

Issue-ID: CCSDK-2846
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I7680fb01d133804e26948228c62a89e353159383

Fixing docker image tag

Moving related properties to parent most pom and using same across
Removing unnecessary version tag from poms

Issue-ID: CCSDK-2794
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I37d16d3f7a467bb579f70235f69a8bff0fe4ba8e

Merge "Support parsing of XML files within Velocity and Jinja Template."

adding saving action at workflow designer

Issue-ID: CCSDK-2298
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I7cea1c9e5933df34b53acaaa7bf92ec5ac72c0ae

Update Wizard Content

Issue-ID: CCSDK-2705

Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com>
Change-Id: I57f207a49a2de99ecf137a5f15aa0260007d8ac1

Support parsing of XML files within Velocity and Jinja Template.

Issue-ID: CCSDK-2769

Signed-off-by: Ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: Ib79af3f7621d14176700d80e987c0cdf5a8a11a6

adding import package basic functionalities

Issue-ID: CCSDK-2842
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I62a260aca9274900ed32706d79efbb09590e20b1

Fixing dockerFile

Fixing dockerFile and related items
Refactoring pom properties

Issue-ID: CCSDK-2794
Change-Id: Ib9d3cc38c2db65778cef2590ab774035305a16fa
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>

Merge "disable componetCanDeactivate with some functionality"

disable componetCanDeactivate with some functionality

Issue-ID: CCSDK-2739
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: Ic3f3905b062f42365c8d7eed22d0ee9504906ee5

Fixing DockerFiles

refactoring to use onap certified base image and combining run commands

Issue-ID: CCSDK-2794
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Id31d5a0018cbce14e54f4aa3e5caebb75dda2276

Fixing DockerFiles

Copying starting script to respective dir as root and then running as user onap

Issue-ID: CCSDK-2794
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I2b3c27cc8e3a378f9ceeeb0de62f81de9fc38c6b

Merge "Remove overflow hidden / Decreasize size for visibility"

Revert change assembly descriptor id

Changing ID also changes the file name of the zipfile.
This caused the -Pdeploy-cba to fail as it was expecting
a file with ending *-cba.zip, instead it got *-cba_zip.zip

Issue-ID: CCSDK-2787
Change-Id: I825218724fd917a69a727cb1945cf313c950b27f
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

Remove overflow hidden / Decreasize size for visibility

Issue-ID: CCSDK-2744
Change-Id: I6ad2606337514c7bf337f99fbeaf3fb3f2dad6a7
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>

Merge "adding deploy feature"

Merge "Fix Sphinx version"

adding deploy feature

Issue-ID: CCSDK-2299
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I1b4ac4d12d18371cd4db9226ca8cbd215f01b3b3

change beahvior of edit

enable editing in package version only
Issue-ID: CCSDK-2336
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I5878b463f08dc3575ea90cd65611389eacbb8b4f

Fix Sphinx version

Issue-ID: CCSDK-2788
Change-Id: I42987b9fc33665f1b71904736dac070d1397c863
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>

Merge "improve manual enrichment"

keeping package changes safe

give user chance to discard changes or save changes
Issue-ID: CCSDK-2336
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: If1e1c94ef65822428f25cca071103c9022add144

improve manual enrichment

Issue-ID: CCSDK-2542
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I3ec0bdc702f7e424896bd57c4560ab60349bbc37

Refactoring poms groupId artifactId

Issue-ID: CCSDK-2787
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ica64f0c793beabb47950c7bf1eede63a0dbf3cea

JDK11 upgrade

Issue-ID: CCSDK-1870

commit2: update surefire plugin to 3.0.0-M5. Need at least M3 for JDK11. S
  Still TODO: what to do about the spring-boot-parent. it may need a bump as well.
commit3: update parent with surefire 3.0.0-M5
commit4: another surefire version update + failsafe version update.
commit5: uncomment surefire def'n in parent pom. It may need to be redefined...
commit6: update to parent 2.0.1-SNAPSHOT
commits... rebasing/minorfixes
commit14: disabling HealthCheckApplicationTests test
commit19: Kapil bugfixes: Jsonfiles "isForce" replaces (incorrect) "force"; bumps kafka scala version to 2_13
commit20: fixe back kafka scala version to 2_11
commit25: reverted + applied patches for 2_13 (due to springboot parent update) + 'application' pom to use forCount=1 and reuseForks=false and reverted scanUatEmpoweredBlueprints modification in BluepritnsAcceptanceTest
commit30: rebase
commit31: SDCListener tests fixes. JMockit updated from 1.19 to 1.49. Since 1.42, need to do these changes https://jmockit.github.io/tutorial/Introduction.html#runningTests
commit32: Dockerfiles cleanup. adduser/group params are different from Alpine.
commit33: Dockerfile for SDClistener typo
commit34: Addressed Dan's comments.
commit35: Image was changed to 1.0.1 (which will be built soon), and the updated base image will already have 'onap' user and group, hence the adduser/group wouldn't be needed.
commit36: rebase
commit37: bumped up BP proc maven-surefire-plugin Xmx
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: I3d864d500150e7d81bb2ce73333f2db67c004e93

Fix autostart for tour-guide in edit

Issue-ID: CCSDK-2705

Signed-off-by: Ahmedeldeeb50 <ahmed.eldeeb.ext@orange.com>
Change-Id: Ib91a0804ff2fab56a20446eb05cada4385961d52

Merge "Init version containing video of demo"

Merge "Update Wizard style"

Init version containing video of demo

Issue-ID: CCSDK-2744
Change-Id: Ie17564ff72033e8d267f48bbaa9e9f32e6db7ee7
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>

Update Wizard style

Issue-ID: CCSDK-2709

Signed-off-by: Sarah Abouzainah <sabouzainah.ext@orange.com>
Change-Id: I189e3425e0ad2b3b51918dba94c6d9f6b4081c63

Merge "Changed method of k8s-upload-profile template prefix acquisition"

Changed method of k8s-upload-profile template prefix acquisition

Issue-ID: CCSDK-2630
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: Id3a493875a171ef374a4e2f0354ca7fe706d0a48

refactor package creation and configuration

Issue-ID: CCSDK-2542
Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com>
Change-Id: I3525114bde445e21f1d0df880b1e7f5ac512d3dc

Merge "Upgrade springfox to version 2.10.5"

Add Working directory + Fix API names

Issue-ID: CCSDK-2703
Change-Id: I11b452373523a4e5d57d916b50d557e879fd2412
Signed-off-by: JakobKrieg <jakob.krieg@bcmsolutions.de>

Upgrade springfox to version 2.10.5

Upgrade version of springfox to 2.10.5 to address known security
vulnerabilities.

Issue-ID: CCSDK-2634
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I2c86040748382c6f8f9891d704ee92320cbe2240