Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/integration.git from branch 'master'
to 1160da46b6fd3a98608e59ca82c14529af94edbd
- Revert zfs and ceph volume
Issue-ID: SDC-2502
Change-Id: Ief0bfdc02b05dca33a99d6a041ba905fb3cfd780
Signed-off-by: Brian Freeman <bf1936@att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 496538442c516e080441e408441a9d839b0ff80b
- Add onboarding package for pnf sim
Issue-ID: INT-1134
Signed-off-by: wsliwka <wojciech.sliwka@nokia.com>
Change-Id: I4a23e51b5e46f04d0299b1bb997f572ec828e616
|
|
* Update docs/submodules/integration.git from branch 'master'
to a76adb4357259ce40360bbc349297d97e9174d29
- Updating vfw_edgeX documentation.
Changes to the document has been made on wiki. Relecting those
here to have a uniform documentation available to all.
Issue-ID: MULTICLOUD-709
Signed-off-by: Akhila Kishore <akhila.kishore@intel.com>
Change-Id: I103bf97a54ca42f83baf05d3cf4db2189ab0b5b3
|
|
* Update docs/submodules/integration.git from branch 'master'
to 2b2b7990ed1f14664cc745078f9540345a16e7c5
- k8s: Add Makefile targets for testing
Issue-ID: SECCOM-235
Change-Id: I6ac5f3c160f1cd1d8faac90576ab943d4ed213a5
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to ab8186eb931abc8ae8664d377e8e7685c4cb2292
- k8s: Add Makefile targets for external dependencies
Building "check" binary now requires several external dependencies. To
minimize setup effort, convenience make targets were provided.
Issue-ID: SECCOM-235
Change-Id: Iec74c0652a5ed3a90d4504216b00ef20bdb7e81f
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 2b5b2e0ff77608cfdfc8a949076860672b38b93f
- k8s: Add support for RKE-deployed clusters
RKE is used as a Kubernetes cluster deployment method from ONAP Dublin
release. RKE cluster definition is used to get access to necessary
information.
Issue-ID: SECCOM-235
Change-Id: I588598011ea746b5f7ba327a48f1cea605e56d31
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 57fae769fca12e55b0890316112fa3da19803cdc
- k8s: Add test cases for Dublin API server
Issue-ID: SECCOM-235
Change-Id: Ie6d43b9db767f191f883a2912916bc8abf9d3ad6
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to b18d03d74734d0953698368b8da4a9ef90b9f113
- k8s: Unify order of API server test cases
So far CIS-compliant configuration has been validated first unless
configuration used in ONAP release did not pass given benchmark.
Issue-ID: SECCOM-235
Change-Id: Ibdb523ab7ab6b8285757719721f75aca57beeb82
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 6cec5272c3887bf998c56c5243f7ee6ee964e3fb
- Pnfsimulator-docker push configuration
New configuration for pnfsimulator and netconfsimulator added for docker builds.
Version of maven docker plugin downgraded to 1.0.0
Single tag added to images
Change-Id: Ia0e38b2c65e943614c7463d7889a7ca0b1aa0517
Issue-ID: INT-1134
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 8fff4b587d7a19079fa0b2de5ffa31dfb639d7a2
- Add doc about ONAP Postman collection
Issue-ID: INT-1185
Signed-off-by: Rene_Robert <rene.robert@orange.com>
Change-Id: I1cf5d79951bfff5ff71e488a1c524099bd2d37a8
|
|
* Update docs/submodules/integration.git from branch 'master'
to e466145e1c1e359a388f3bd2e15130941ac76c1e
- k8s: Make ONAP context default for kubectl
This patch uses previously added alias for kubectl context switching in
case it is needed as a template for other contexts as well.
Issue-ID: SECCOM-235
Change-Id: Ie92641ee3763a027cd74dd21bf4364a2d796eb1d
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
- k8s: Silence package manager and make it noninteractive
This patch sets debconf frontend to noninteractive by including
additional field in the first stanza of configuration file. Its
placement has been chosen arbitrarily - both 'Config' and 'Templates'
fields "are required in this first stanza" [1].
It also makes symlinking script more generic.
[1] man 5 debconf.conf (provided by "debconf-doc" in Ubuntu)
Issue-ID: SECCOM-235
Change-Id: If9dcc712d1ff7f527d3bc59f4c1709cffe4cbda5
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
- k8s: Add kubectl provisioners (downloading and setting up)
Setting up kubectl depends on presence of K8s cluster post-deployment
artifacts, hence it's disabled by default. Relevant information added to
post-up message.
This patch also removes unneeded curly braces from
"tools/dublin/get_rke.sh" script.
Issue-ID: SECCOM-235
Change-Id: I917ebbda588639f0941e16c65759430a7a1e64ff
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
- k8s: Make operator machine destruction graceful
Issue-ID: SECCOM-235
Change-Id: I9913d9a8f525b4b9582bf821008dd567258a719c
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 64092cb637805d0d12d08488cdb19a0ada136fd6
- k8s: Add post-up message for actual cluster creation
Issue-ID: SECCOM-235
Change-Id: I8f9d4362da50a8b3f2aa1baf3633d818da2ed3a5
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 0ebd04f1cbce5640747b6791582c7b8db09ef8ea
- Issue-ID: INT-1178
updated Postman collection for Dublin
Signed-off-by: Rene_Robert <rene.robert@orange.com>
Change-Id: I94b9180e86b96f75780854211da67d85acc90d48
|
|
* Update docs/submodules/integration.git from branch 'master'
to a3990d05cd7a7f92a383cdeb9e4e89f0bc0d8a7b
- Correct minor issues in onap deployment scripts
Generated by deploy.sh heat template has been fixed to allow
provisioning onap without proxy. Some minor fixes have been
also implemented in openstack resources checks and git operations.
Issue-ID: MULTICLOUD-708
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: Ie97b1845e217068a1c5634fbf8f2864cd4a4da29
|
|
* Update docs/submodules/integration.git from branch 'master'
to 86223f2aeffa0f4f43f0a4cc7dc6100ca44b671f
- change flavor for longer live migration timeout
Issue-ID: INT-835
Change-Id: I40ba07a98e9b57d9d7ba6232dc8836a0899c3366
Signed-off-by: Brian Freeman <bf1936@att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to ba7c074a4575f919b7f6112e7b59c18b5578d625
- Fix typo in scale out documentation
Change-Id: Ib9776a1d944fda8d2a325521469988d2c24c8a6b
Issue-ID: INT-1171
Signed-off-by: Marco Platania <platania@research.att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 100aceb80cc8e896aa5be701092c20f7da049f78
- Convert SB05/06/07 to Shared tenants
Issue-ID: INT-1172
Change-Id: I52e83b370bc1611bdd770258d3860e44c4bde931
Signed-off-by: Brian Freeman <bf1936@att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 3664e04b04ade624c1b2ee5bd2876939aed812cc
- k8s: Allow Dublin cluster creation using RKE
This patch adds sample cluster.yml which is based on Dublin cluster
configuration file [1]. Main difference is in avoiding repetition by
using anchors and alias nodes.
Actual cluster creation provisioner is disabled by default because
'control' and 'worker' nodes might not be ready yet.
[1] https://docs.onap.org/en/dublin/_downloads/27934fe702048777f312d77dc30cd05a/cluster.yml
Issue-ID: SECCOM-235
Change-Id: Ibba0e754ba87e334cdaa61de83e48107f91083d9
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to eb166a53ceb3e6f0f2b6a41c432fe3baa7d24d53
- k8s: Extract hardcoded synced folder for dotfiles
Issue-ID: SECCOM-235
Change-Id: I85efb88476cb1d6bfaee44b6bcd6275477e77ba5
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 63640ac2f6d4456eb07a91a9f16783c1b866e720
- k8s: Use named provisioners
This not only makes testing easier, but also allows better control over
VM provisioning after its creation.
Issue-ID: SECCOM-235
Change-Id: I29ab3ed46976267e1043c2f61f56578f2c5d7a57
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 435200f0bc6b8a7d75ab9e019361cd4ced0d6b58
- k8s: Add simple logging to provisioning scripts
Issue-ID: SECCOM-235
Change-Id: Iaeb4b3e621f09ea14b9576126223e4df4b8682f3
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 6b1f78b2efca686e61058ea5848b1f31d3f59270
- k8s: Unify provisioning scripts
This patch:
* removes remaining string interpolation (for future script reuse),
* makes DNS replacement provisioner always run.
This way VM definition is more concise and resilient.
Issue-ID: SECCOM-235
Change-Id: I382dae5e256b46577c4c8af3aa45ab4d64d1b2b9
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 5ee92067ff6bcf970a0418b235ca3daa6247ff05
- k8s: Remove repetition from provisioning scripts
Issue-ID: SECCOM-235
Change-Id: If286ba074ee74c43705197a30c50322d5162e6fc
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
- k8s: Remove hardcoded password for 'vagrant' user
Password for 'vagrant' user is now passed through exported environmental
variable.
This patch also:
* removes the assumption of having 'vagrant' user on cluster nodes (for
future scripts reuse),
* removes mixed string interpolation and passing shell variables,
* replaces '~' with '$HOME' for proper substitiution.
Issue-ID: SECCOM-235
Change-Id: Id9e7b6acccd902de4c414cd8a0f095ac135fee5a
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 34e5932d0db1d3aeeed962df176d3b635018e641
- k8s: Silence download utilities
This patch intends to make virtual environment creation logs more
readable. Parameters were chosen in a way errors will still be shown the
operator.
This patch might also prove itself useful in other virtual environment
creation tools such as 'devtool' [1] (unless maintainers insist on
having full logs).
[1] https://git.onap.org/integration/devtool
Issue-ID: SECCOM-235
Change-Id: I5e07b1b1ed37d36470c18ba0cfe653e40eff300b
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 2b0d4633f2ec61d313ea1ebfd89730eb01ab8179
- Update for Keystone V3
Issue-ID: OOM-1982
Change-Id: I919cd28934eceb5595f93bcde52879b9ce6699fd
Signed-off-by: Brian Freeman <bf1936@att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 64105bb121e99e00f7124a0e7272f4cbb08310af
- Fix typos in the scale out documentation
Change-Id: Id245450940506af726d2219c34c0033e2151c21b
Issue-ID: INT-1171
Signed-off-by: Marco Platania <platania@research.att.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to f8a1ad0768dde0c3babc035b173dc3b87079a7d6
- k8s: Change virtual environment utility scripts privilege requirements
This patch also extends in-file comment on scripts' requirements and
suggested usage.
Issue-ID: SECCOM-235
Change-Id: I0dddbad79fb3392ffe35c3e06d4006cd499d9923
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 07adef3d6e19737962ad63b9eae36f18ccab02bb
- k8s: Add "vagrant" user to "docker" group in virtual environment
Node customization scripts do that for "ubuntu" user only (added by
default on OpenStack images). Vagrant boxes use "vagrant" user [1]
instead.
[1] https://www.vagrantup.com/docs/boxes/base.html#quot-vagrant-quot-user
Issue-ID: SECCOM-235
Change-Id: Ic4f832aa9a37230503e3c5bd29f8ae5fcd3883db
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to bbf79d7cd7a2a0abd6cbed029ee90fc9d119f3ef
- Get rid of binary files in pnfsimulator repo
Remove usage of binary files in pnfsimulator vcs
Issue-ID: INT-1134
Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
Change-Id: I23b8f01a099b7e80542d258b2e0bcd34742d3684
|
|
* Update docs/submodules/integration.git from branch 'master'
to b7f08110865e5e79cf018a6ab9d80f3e7dec20af
- k8s: Add virtual environment for Dublin
Default cluster nodes customization scripts were extracted in the same
manner as those for Casablanca release [1]. Constraints still apply.
[1] SHA-1: ea8bc1a719a36c89e7eae42080b1835e5ef0c28d
(Change-Id: I57f9f3caac0e8b391e9ed480f6bebba98e006882)
Issue-ID: SECCOM-235
Change-Id: I54ada5fade3b984dedd1715f20579e3ce901faa3
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 961b6441342214281379cf880eacc835aea2bc9c
- k8s: Extract all remaining hardcoded constants
Vagrant VM definition no longer contains hardcoded values in cluster
definition.
Issue-ID: SECCOM-235
Change-Id: Id9f2d9878a7d788a62d5a12ccd47dfafe9f39fe3
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to e377eb06714e5f53b64ae1d6f699e47bf6b13af3
- k8s: Replace default DNS to work in corporate networks
Default DNS addresses used in "generic/ubuntu1604" box (4.2.2.1,
4.2.2.2, 208.67.220.220) might not work properly in corporate
environment. To deal with this, host machine DNS configuration can be
used instead.
Issue-ID: SECCOM-235
Change-Id: Ic8a5553f01989e1a2b00228fa0449a680f11d452
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 611424ff732211b920402518a1a0abd23d658f03
- Script to pull ONAP images in helm charts
Issue-ID: INT-1117
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: Iefba99a8cec034e3fb8d0bf828aeb342ee0f8d5e
|
|
* Update docs/submodules/integration.git from branch 'master'
to 032ff22ef20b59950a8b5fae8d2ba6d03e93ac93
- Opensourcing new version of Simulator
Additional info in README.md
Issue-ID: INT-1134
Signed-off-by: Wojciech Sliwka <wojciech.sliwka@nokia.com>
Change-Id: I06d41fd3f361b7a451b30b702882810e4136a129
|
|
* Update docs/submodules/integration.git from branch 'master'
to 79c9b78adb7fbc943fd2aee7d333fd3cadf5b8f3
- SDC alignment SOL004 2.6.1
Updating TOSCA.meta metadata Created-by key to Created-By
Issue-ID: SDC-2402
Change-Id: I15ce47d3d97b5809ad5baa34a366c0d10333cb00
Signed-off-by: bilal.iqbal <bilal.iqbal@est.tech>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 2f3caa5c27d339c6a371d6e5f9d81519e919d96c
- modify the configuration in consul for dfc
modify the configuration in consul in order to support dfc
to fetch the merged configuration
Issue-ID: INT-1155
Change-Id: I6d73987183851ed38225796c9f426a1010376fd3
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
|
|
* Update docs/submodules/integration.git from branch 'master'
to a79a043b5a99fa05e9f73559ff1c3b2e36bd70c0
- Added support for Consul/CBS and multiple DFCs
Issue-ID: INT-1155
Change-Id: I3c1ed2f6072655c4396e406ddfd490d3786fe4d6
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
|
|
* Update docs/submodules/integration.git from branch 'master'
to c98471c6541573d73edc677272f23e06c6c28dbc
- Update NBI Postman based on changes in Dublin Release
Issue-ID: EXTAPI-245
Signed-off-by: aosull01 <adrian.osullivan@huawei.com>
Change-Id: Ia60be462bf4980b341f54ad9797640dba549db91
|
|
* Update docs/submodules/integration.git from branch 'master'
to 03c5935b671ed7edcb5ec254f91f1f61907b02e6
- k8s: Fix mismatching names in Rancher CLI downloader
Issue-ID: SECCOM-235
Change-Id: Iab0086634bcfaba772852352c72e03a3d6833801
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 6bbff98bfe55838448a03ec52c25c06feec2e8db
- k8s: Move release-specific files to separate directory
Kubernetes cluster deployment procedure changed with Dublin release
(Rancher to RKE). In order to prepare for further adjustments,
incompatible content will be moved to separate directories.
Once Casablanca becomes obsolete (by the time of El Alto), files
specific to that release will be removed completely.
Issue-ID: SECCOM-235
Change-Id: Iaa0fc2f6ad330ec09dcfdf8a2d27b8a4dc433a0f
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to e3a828592d9a57e2d73fbd4984a4d28a3e7439e6
- Put NFS VM flavor back to m1.large
Issue-ID: INT-1117
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I4afb90e6b8ad78b1e8778e5e8c65fe418a2caba7
|
|
* Update docs/submodules/integration.git from branch 'master'
to e781c7c4e4e385f504254d0fd32f534d559af3c2
- Mass PNF-sim unique VSFTPD PASV ports
Issue-ID: DCAEGEN2-1660
Change-Id: Ib742755f6a924ee9c5babe8e411311e7fe0e6802
Signed-off-by: TamasBakai <tamas.bakai@est.tech>
|
|
* Update docs/submodules/integration.git from branch 'master'
to e21a3c642c913a777c45b1e2c80d9cf8d32ec0c2
- Change onap_oam_ext network settings for vFWDT
Enable DHCP
Add static route for 10.12.0.0/16 to 10.100.0.1
Issue-ID: INT-1083
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I8a77ef475622a987000812cedc8d8f51a968ee0f
|
|
* Update docs/submodules/integration.git from branch 'master'
to 8ec5130ce28bc3dd731c2eb10d54e58b8e155190
- Reduce ONAP VM footprint
Reduce size of NFS and orch VMs to m1.medium
Reduce default number of worker VMs to 9
Issue-ID: INT-1117
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I53dc47ccd3d8bad03bcbc109a68b23b75314dbaa
|
|
* Update docs/submodules/integration.git from branch 'master'
to 3adfd35f7946e0ff31870fe69ab7f43d127303b2
- Bug fix in deploy script
Issue-ID: INT-1128
Signed-off-by: Gary Wu <gary.wu@futurewei.com>
Change-Id: I500a920389d3ed9fd792f5ece7c22f9356a86fc8
|
|
* Update docs/submodules/integration.git from branch 'master'
to a6d37fe2d27024609815d1fafd7821c54f6b5d1d
- update description of 5g pnf software update
Signed-off-by: Yaoguang Wang <sunshine.wang@huawei.com>
Issue-ID: INT-1104
Change-Id: Ifcd2e0488422759ffff8789bfb0bce9ea05aab4a
|
|
* Update docs/submodules/integration.git from branch 'master'
to 1d00e970300921d28e70a8b1748f6cda67388e5c
- Issue-ID: INT-1129
adding instantiation operations that were missing
amend : set subscriptionServiceType to vLB
Signed-off-by: Rene_Robert <rene.robert@orange.com>
Change-Id: Icf7884a46ac07babda283fa464fe2fbedbe7eafe
|
|
* Update docs/submodules/integration.git from branch 'master'
to 125d00b3b5dfda960f7eb8c5d87bf79455b3df1f
- Update pnf and 5g use case doc
Signed-off-by: Yang Xu <yang.xu@futurewei.com>
Issue-ID: INT-1104
Change-Id: I9fa7e1babd7b7cdbdfbec71600ebed6c81ba450b
|
|
* Update docs/submodules/integration.git from branch 'master'
to 660f496429b43a02e0c254ae49ce63163f6f2b27
- k8s: Make convenience targets CI-friendly
Previously "clean" target failed if there were no build artifacts. Now
their absence is ignored.
Issue-ID: SECCOM-235
Change-Id: I47beb2754a893e8b7453611116b4da2e516cca90
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|
|
* Update docs/submodules/integration.git from branch 'master'
to 056ef4c18a177e179ce288247f67cf23dad47c18
- k8s: Add tests for API server validators
This patch also adds convenience target to the Makefile and updates
documentation on relevant dependencies.
Issue-ID: SECCOM-235
Change-Id: I57e00af3cd4c60af3128e3094607cc61bc1e5dbe
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
- k8s: Relax kublet HTTPS connection requirement
According to kube-apiserver documentation [1] and CIS guideline 1.1.4
option "--kubelet-https=" might be absent in API server configuration.
It has secure configuration (being set to "true") by default.
[1] https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/
Issue-ID: SECCOM-235
Change-Id: I604cdcace03f65185aab6a0b34d48cfec94277ab
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
- k8s: Make Rancher CLI provisioner configurable
Apparently Linux AMD64 machines are not the only ones used for ONAP
development (author meant no harm).
Issue-ID: SECCOM-235
Change-Id: Ia78a02fb82dc5752d6b8fd2cef8e6ef583fd3ca6
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
|