diff options
author | xuegao <xg353y@intl.att.com> | 2019-12-13 11:50:24 +0100 |
---|---|---|
committer | xuegao <xg353y@intl.att.com> | 2019-12-16 13:00:03 +0100 |
commit | 9047defa7549ebd9a84cef3e10bbfd90f068097b (patch) | |
tree | 4cb5d0f32ca599d6a8ae7d3490f331af1e40383b /src/test | |
parent | 4d8c1ab21a3f5baf82a91a3cc9ab2af8823e6e34 (diff) |
Update deploymentParameters
Update deploymentParameters to allow a map of <msName, deploymentParams>
instead of a single deploymentParam
Issue-ID: CLAMP-569, CLAMP-570
Change-Id: I6abc4fe193157644bd6abe1c893a1416cadec988
Signed-off-by: xuegao <xg353y@intl.att.com>
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java | 86 | ||||
-rw-r--r-- | src/test/resources/example/sdc/expected-result/deployment-parameters.json | 43 |
2 files changed, 129 insertions, 0 deletions
diff --git a/src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java b/src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java new file mode 100644 index 000000000..8834ef667 --- /dev/null +++ b/src/test/java/org/onap/clamp/loop/deploy/DeployParametersTest.java @@ -0,0 +1,86 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2019 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Modifications copyright (c) 2019 Nokia + * Modifications Copyright (c) 2019 Samsung + * ================================================================================ + * 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. + * ============LICENSE_END============================================ + * =================================================================== + * + */ + +package org.onap.clamp.loop.deploy; + +import com.google.gson.JsonObject; + +import java.io.IOException; +import java.util.LinkedHashSet; + +import org.junit.Assert; +import org.junit.Test; +import org.mockito.Mockito; +import org.onap.clamp.clds.sdc.controller.installer.BlueprintArtifact; +import org.onap.clamp.clds.util.JsonUtils; +import org.onap.clamp.clds.util.ResourceFileUtil; +import org.onap.clamp.loop.Loop; +import org.onap.clamp.policy.microservice.MicroServicePolicy; +import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; + +public class DeployParametersTest { + + private BlueprintArtifact buildFakeBuildprintArtifact(String blueprintFilePath) throws IOException { + BlueprintArtifact blueprintArtifact = Mockito.mock(BlueprintArtifact.class); + Mockito.when(blueprintArtifact.getDcaeBlueprint()) + .thenReturn(ResourceFileUtil.getResourceAsString(blueprintFilePath)); + return blueprintArtifact; + } + + private LinkedHashSet<BlueprintArtifact> buildFakeCsarHandler() throws IOException, SdcToscaParserException { + + LinkedHashSet<BlueprintArtifact> blueprintSet = new LinkedHashSet<BlueprintArtifact>(); + + BlueprintArtifact blueprintArtifact = buildFakeBuildprintArtifact("example/sdc/blueprint-dcae/tca.yaml"); + + blueprintSet.add(blueprintArtifact); + // Create fake blueprint artifact 2 on resource2 + blueprintArtifact = buildFakeBuildprintArtifact("example/sdc/blueprint-dcae/tca_2.yaml"); + blueprintSet.add(blueprintArtifact); + + // Create fake blueprint artifact 3 on resource 1 so that it's possible to + // test multiple CL deployment per Service/vnf + blueprintArtifact = buildFakeBuildprintArtifact("example/sdc/blueprint-dcae/tca_3.yaml"); + blueprintSet.add(blueprintArtifact); + return blueprintSet; + } + + @Test + public void getDeploymentParametersinJsonTest() throws IOException, SdcToscaParserException { + Loop loop = Mockito.mock(Loop.class); + MicroServicePolicy umService = Mockito.mock(MicroServicePolicy.class); + LinkedHashSet<MicroServicePolicy> umServiceSet = new LinkedHashSet<MicroServicePolicy>(); + Mockito.when(umService.getName()).thenReturn("testName"); + umServiceSet.add(umService); + Mockito.when(loop.getMicroServicePolicies()).thenReturn(umServiceSet); + + DeployParameters deployParams = new DeployParameters(buildFakeCsarHandler(), loop); + JsonObject paramJson = deployParams.getDeploymentParametersinJson(); + + Assert.assertEquals(JsonUtils.GSON_JPA_MODEL.toJson(paramJson), + ResourceFileUtil.getResourceAsString("example/sdc/expected-result/deployment-parameters.json")); + } +} diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters.json b/src/test/resources/example/sdc/expected-result/deployment-parameters.json new file mode 100644 index 000000000..2e10ac37e --- /dev/null +++ b/src/test/resources/example/sdc/expected-result/deployment-parameters.json @@ -0,0 +1,43 @@ +{ + "dcaeDeployParameters": { + "testName": { + "location_id": "", + "service_id": "", + "policy_id": "testName" + }, + "testName1": { + "aaiEnrichmentHost": "aai.onap.svc.cluster.local", + "aaiEnrichmentPort": "8443", + "enableAAIEnrichment": true, + "dmaap_host": "message-router.onap", + "dmaap_port": "3904", + "enableRedisCaching": false, + "redisHosts": "dcae-redis.onap.svc.cluster.local:6379", + "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1", + "consul_host": "consul-server.onap", + "consul_port": "8500", + "cbs_host": "config-binding-servicel", + "cbs_port": "10000", + "external_port": "32012", + "policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "policy_id": "testName" + }, + "testName2": { + "aaiEnrichmentHost": "aai.onap.svc.cluster.local", + "aaiEnrichmentPort": "8443", + "enableAAIEnrichment": true, + "dmaap_host": "message-router.onap.svc.cluster.local", + "dmaap_port": "3904", + "enableRedisCaching": false, + "redisHosts": "dcae-redis.onap.svc.cluster.local:6379", + "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest", + "consul_host": "consul-server.onap.svc.cluster.local", + "consul_port": "8500", + "cbs_host": "config-binding-service.dcae.svc.cluster.local", + "cbs_port": "10000", + "external_port": "32012", + "policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "policy_id": "testName" + } + } +}
\ No newline at end of file |