aboutsummaryrefslogtreecommitdiffstats
path: root/adapters
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2019-04-18 10:56:46 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-18 10:56:46 +0000
commit074c0ebe9c1a0db0a5e0cc936898c35569ff4029 (patch)
tree0ad684d333eb1cd340bd78cabdb3145b56d439ab /adapters
parent14a0406521ec15e259729dcd27e9aaac14517e66 (diff)
parentedf132efb3d616f582350bc3f77ed20e79d3b9c6 (diff)
Merge "Changed constants collections to immutable"
Diffstat (limited to 'adapters')
-rw-r--r--adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
index 7bf68fff78..e16bf90d4d 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoMulticloudUtils.java
@@ -28,9 +28,7 @@ import com.woorea.openstack.heat.model.CreateStackParam;
import com.woorea.openstack.heat.model.Stack;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Arrays;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Scanner;
import javax.ws.rs.core.Response;
@@ -64,6 +62,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
+import com.google.common.collect.ImmutableSet;
@Component
public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin {
@@ -75,8 +74,8 @@ public class MsoMulticloudUtils extends MsoHeatUtils implements VduPlugin {
public static final String VF_MODULE_ID = "vf_module_id";
public static final String TEMPLATE_TYPE = "template_type";
public static final String MULTICLOUD_QUERY_BODY_NULL = "multicloudQueryBody is null";
- public static final List<String> MULTICLOUD_INPUTS =
- Arrays.asList(OOF_DIRECTIVES, SDNC_DIRECTIVES, USER_DIRECTIVES, TEMPLATE_TYPE);
+ public static final ImmutableSet<String> MULTICLOUD_INPUTS =
+ ImmutableSet.of(OOF_DIRECTIVES, SDNC_DIRECTIVES, USER_DIRECTIVES, TEMPLATE_TYPE);
private static final Logger logger = LoggerFactory.getLogger(MsoMulticloudUtils.class);
background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
{
    "serviceName": "Vf zrdm5bpxmc02092017-Service",
    "serviceInvariantUUID": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b",
    "serviceUUID": "bad955c3-29b2-4a27-932e-28e942cc6480",
    "serviceVersion": "1.0",
    "serviceArtifacts": 
    [{
		"artifactName": "service-VfZrdm5bpxmc02092017Service-csar.csar",
		"artifactType": "TOSCA_CSAR",
		"artifactURL": "service-VfZrdm5bpxmc02092017Service-csar.csar",
		"artifactChecksum": "MWQ3Y2FmMWExNDQyYWI2N2YwNjEwZGUzN2IzMzI3NjE=",
		"artifactDescription": "TOSCA definition package of the asset",
		"artifactTimeout": 0,
		"artifactUUID": "396cfd49-0f4b-4fec-9f33-0fd7e90d5a22",
		"artifactVersion": "1"
    }],
    "resources": 
    [	
        {
            "resourceInstanceName": "Vf zrdm5bpxmc02092017-VF 0",
            "resourceInvariantUUID": "23122c9b-dd7f-483f-bf0a-e069303db2f7",
            "resourceCustomizationUUID": "96c23a4a-6887-4b2c-9cce-1e4ea35eaade", 
            "resourceName": "Vf zrdm5bpxmc02092017-VF",
            "resourceType": "VF",
            "resourceUUID": "14ba5d1e-3862-407c-a236-1cbaebccce77",
            "resourceVersion": "1.0",
            "category": "Generic",
            "subcategory": "Network Elements",
            "artifacts": 
            [
                {
                    "artifactChecksum": "NmEyZjc1Y2UwZDMwYjFhNGRlMTMzN2JhNzdiMThjMGU=",
                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
                    "artifactName": "pxmc_mmn_volume.env",                    
                    "artifactType": "HEAT_ENV",
                    "artifactURL": "pxmc_mmn_volume.env",
                    "artifactUUID": "c1ae6284-48d9-4437-a195-b2cf2ba23070",
                    "artifactTimeout": 0,
                    "artifactVersion": "2"
                },
                {
                    "artifactChecksum": "OGM2MWIzZTA2OTc5YjQwNTM1NGVhODA0YTFkNzM4ZTg==",
                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
                    "artifactName": "pxmc_base.env",
                    "artifactTimeout": 0,
                    "artifactType": "HEAT_ENV",
                    "artifactURL": "pxmc_base.env",
                    "artifactUUID": "6dd99c31-c52e-4c45-b99b-d223c877a296",
                    "artifactVersion": "2.0"                 
                },                
                {
                    "artifactChecksum": "MzJmZjgyZWYwOTBjMTg5M2ExNWZhMmMwNzc1NWY1YjQ=",
                    "artifactDescription": "created from csar",
                    "artifactName": "user_data_zrdm5bpxmc02vmt001.txt",
                    "artifactTimeout": 0,
                    "artifactType": "HEAT_ARTIFACT",
                    "artifactURL": "user_data_zrdm5bpxmc02vmt001.txt",
                    "artifactUUID": "53acdabe-689f-45e5-8578-f1514d3529da",
                    "artifactVersion": "1"                   
                },                
                {
                    "artifactChecksum": "MjY0NzcxMjJkZGI4YzQ1MDU2NjhkNWYyM2IwNmYzYmU=",
                    "artifactDescription": "Auto-generated VF Modules information artifact",
                    "artifactName": "vfzrdm5bpxmc02092017vf0_modules.json",
                    "artifactTimeout": 0,
                    "artifactType": "VF_MODULES_METADATA",
                    "artifactURL": "vfzrdm5bpxmc02092017vf0_modules.json",
                    "artifactUUID": "e3b82cd6-485e-4d56-8d2c-17ccf6a59533",
                    "artifactVersion": "1"                   
                },                
                {
                    "artifactChecksum": "YWQ2MmE0Y2NjNGE4YmJlOTk0YmZhYmIxYTc1YWZkY2M=",
                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
                    "artifactName": "base_TEST.env",
                    "artifactTimeout": 0,
                    "artifactType": "HEAT_ENV",
                    "artifactURL": "base_TEST.env",
                    "artifactUUID": "57f6520b-fa65-4544-90de-95c8190c2e6c",
                    "artifactVersion": "1.0"                   
                },                
                {
                    "artifactChecksum": "YWQ2MmE0Y2NjNGE4YmJlOTk0YmZhYmIxYTc1YWZkY2M=",
                    "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
                    "artifactName": "base_TEST.env",
                    "artifactTimeout": 0,
                    "artifactType": "HEAT_ENV",
                    "artifactURL": "base_TEST.env",
                    "artifactUUID": "57f6520b-fa65-4544-90de-95c8190c2e6c",
                    "artifactVersion": "1.0"                   
                }
            ]
        }
    ],
    "serviceDescription": "Demo",
    "distributionID": "a2872f55-8628-4486-8548-7b132c9a47db"
}