diff options
author | Patrick Brady <pb071s@att.com> | 2017-12-13 11:19:06 -0800 |
---|---|---|
committer | Patrick Brady <pb071s@att.com> | 2017-12-13 11:19:17 -0800 |
commit | 781b1a6df324419c846c84ea983c18fc8362bfd3 (patch) | |
tree | 580008010dd50ca32db2ef6dc2e36628cf8c2b5b /appc-client/client-kit/src/test/java/org/openecomp | |
parent | 161df8a94bb3b0c34ed16fd4fdba078bd1eeef9a (diff) |
Third part of onap rename
This part of the commit changes the folder structure on all other
folders of appc.
Change-Id: I8acfa11cdfcdcd36be0e137245d1dd7324f1abd3
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-13
Diffstat (limited to 'appc-client/client-kit/src/test/java/org/openecomp')
4 files changed, 0 insertions, 437 deletions
diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java deleted file mode 100644 index 6b24b0a83..000000000 --- a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/impl/business/TestAppcLifeCycleManagerServiceFactoryImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.onap.appc.client.lcm.impl.business; - - -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.onap.appc.client.lcm.api.ApplicationContext; -import org.onap.appc.client.lcm.api.LifeCycleManagerStateful; -import org.onap.appc.client.lcm.exceptions.AppcClientException; -import org.onap.appc.client.lcm.impl.business.LCMRequestProcessor; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -public class TestAppcLifeCycleManagerServiceFactoryImpl { - - AppcLifeCycleManagerServiceFactoryImpl appcLifeCycleManagerServiceFactory=new AppcLifeCycleManagerServiceFactoryImpl(); - - @Ignore - public void testCreateLifeCycleManagerStateful() throws AppcClientException{ - LifeCycleManagerStateful lifeCycleManagerStateful; - ApplicationContext applicationContext=new ApplicationContext(); - applicationContext.setApplicationID("AppID"); - applicationContext.setMechID("mechId"); - String folder="src/test/resources/data"; - Properties properties =getProperties(folder); - lifeCycleManagerStateful=appcLifeCycleManagerServiceFactory.createLifeCycleManagerStateful(applicationContext,properties); - - Assert.assertNotNull(lifeCycleManagerStateful); - - } - - public static Properties getProperties(String folder) { - Properties prop = new Properties(); - - InputStream conf = null; - try { - conf = new FileInputStream(folder + "client-simulator.properties"); - } catch (FileNotFoundException e) { - - } - if (conf != null) { - try { - prop.load(conf); - } catch (IOException e) { - e.printStackTrace(); - } - } else { - try { - prop.load(Thread.currentThread().getContextClassLoader().getResourceAsStream("client-simulator.properties")); - } catch (Exception e) { - throw new RuntimeException("### ERROR ### - Could not load properties to test"); - } - } - return prop; - } -} diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java deleted file mode 100644 index 9cb3b9f56..000000000 --- a/appc-client/client-kit/src/test/java/org/openecomp/appc/client/lcm/model/TestModelPOJO.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.onap.appc.client.lcm.model; - -import org.junit.Assert; -import org.junit.Test; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -public class TestModelPOJO { - static List<Class> pojoClassName; - static List<String> fields; - static{ - pojoClassName = new ArrayList<>(); - pojoClassName.add(AuditInput.class); - pojoClassName.add(AuditOutput.class); - pojoClassName.add(CheckLockInput.class); - pojoClassName.add(CheckLockOutput.class); - pojoClassName.add(ConfigBackupDeleteInput.class); - pojoClassName.add(ConfigBackupDeleteOutput.class); - pojoClassName.add(ConfigBackupInput.class); - pojoClassName.add(ConfigBackupOutput.class); - pojoClassName.add(ConfigExportInput.class); - pojoClassName.add(ConfigExportOutput.class); - pojoClassName.add(ConfigModifyInput.class); - pojoClassName.add(ConfigModifyOutput.class); - pojoClassName.add(ConfigRestoreInput.class); - pojoClassName.add(ConfigRestoreOutput.class); - pojoClassName.add(ConfigScaleoutInput.class); - pojoClassName.add(ConfigScaleoutOutput.class); - pojoClassName.add(ConfigureInput.class); - pojoClassName.add(ConfigureOutput.class); - pojoClassName.add(EvacuateInput.class); - pojoClassName.add(EvacuateOutput.class); - pojoClassName.add(HealthCheckInput.class); - pojoClassName.add(HealthCheckOutput.class); - pojoClassName.add(LiveUpgradeInput.class); - pojoClassName.add(LiveUpgradeOutput.class); - pojoClassName.add(LockInput.class); - pojoClassName.add(LockOutput.class); - pojoClassName.add(MigrateInput.class); - pojoClassName.add(MigrateOutput.class); - pojoClassName.add(RebuildInput.class); - pojoClassName.add(RebuildOutput.class); - pojoClassName.add(HealthCheckInput.class); - pojoClassName.add(RollbackInput.class); - pojoClassName.add(RollbackOutput.class); - pojoClassName.add(RestartInput.class); - pojoClassName.add(RestartOutput.class); - pojoClassName.add(SnapshotInput.class); - pojoClassName.add(SnapshotOutput.class); - pojoClassName.add(SoftwareUploadInput.class); - pojoClassName.add(SoftwareUploadOutput.class); - pojoClassName.add(StartApplicationInput.class); - pojoClassName.add(StartApplicationOutput.class); - pojoClassName.add(StartInput.class); - pojoClassName.add(StartOutput.class); - pojoClassName.add(StopApplicationInput.class); - pojoClassName.add(StopApplicationOutput.class); - pojoClassName.add(StopInput.class); - pojoClassName.add(SyncInput.class); - pojoClassName.add(SyncOutput.class); - pojoClassName.add(TerminateInput.class); - pojoClassName.add(TerminateOutput.class); - pojoClassName.add(TestInput.class); - pojoClassName.add(TestOutput.class); - pojoClassName.add(UnlockInput.class); - pojoClassName.add(UnlockOutput.class); - - fields = new ArrayList<>(); - fields.add("CommonHeader"); - fields.add("Action"); - fields.add("Payload"); - fields.add("Status"); - } - @Test - public void testModel() throws Exception{ - for(String field: fields){ - for(Class c: pojoClassName){ - Object instance = c.newInstance(); - Field[] fields = c.getDeclaredFields(); - for(Field f: fields){ - if(f.getType() == getClassForString(field)){ - Method m = c.getDeclaredMethod("set"+field,getClassForString(field)); - Object argument = createArgument(field); - m.invoke(instance,argument); - - Method getter = c.getDeclaredMethod("get"+field); - Object getValue = getter.invoke(instance); - Assert.assertEquals("POJO test failed for class:"+c.getCanonicalName()+" for method:"+m.getName(),argument, getValue); - } - } - } - } - } - - private Object createArgument(String field){ - if(field.equals("CommonHeader")){ - return createHeader(); - } - else if(field.equals("Action")){ - return createAction(); - }else if(field.equals("Payload")){ - return createPayload(); - }else if(field.equals("Status")){ - return createStatus(); - } - - throw new IllegalArgumentException(); - } - - private Action createAction(){ - return Action.Restart; - } - private Payload createPayload(){ - return new Payload(); - } - private CommonHeader createHeader(){ - CommonHeader header = new CommonHeader(); - header.setApiVer("apiver"); - header.setOriginatorId("originator"); - return header; - } - private Status createStatus() { - return new Status(); - } - - private Class getClassForString(String field){ - - if(field.equals("CommonHeader")){ - return CommonHeader.class; - }else if(field.equals("Action")){ - return Action.class; - }else if(field.equals("ActionIdentifiers")){ - return ActionIdentifiers.class; - }else if(field.equals("Payload")){ - return Payload.class; - }else if(field.equals("Status")){ - return Status.class; - } - throw new IllegalArgumentException(); - } -} diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java deleted file mode 100644 index e75a44e65..000000000 --- a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/JsonHelper.java +++ /dev/null @@ -1,93 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APPC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Copyright (C) 2017 Amdocs - * ============================================================================= - * 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. - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * ============LICENSE_END========================================================= - */ - -package org.onap.appc.generator; - -import com.fasterxml.jackson.databind.JsonNode; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; - -public class JsonHelper { - - private enum PopulateType{ - PARAMETER, - SCHEMA_REF, - ; - } - - public static void populateRpcInputOutputParamsFromJson(final JsonNode jsonNode, Map<String, Set<String>> jsonBodyInputParams, Map<String, Set<String>> jsonBodyOutputParams) { - populateRpcInputOutputParamsFromJson(jsonNode,jsonBodyInputParams, jsonBodyOutputParams,PopulateType.PARAMETER,false); - } - public static void populateRpcInputOutputSchemaRefFromJson(final JsonNode jsonNode, Map<String, Set<String>> jsonBodyInputParams, Map<String, Set<String>> jsonBodyOutputParams) { - populateRpcInputOutputParamsFromJson(jsonNode,jsonBodyInputParams, jsonBodyOutputParams,PopulateType.SCHEMA_REF,true); - } - public static void populateRpcInputOutputParamsFromJson(final JsonNode jsonNode, Map<String, Set<String>> jsonBodyInputParams, Map<String, Set<String>> jsonBodyOutputParams,PopulateType populateType,boolean normalizeRpcOperation) { - //get all yang2json Input and output Params and populate jsonBodyInputParams & jsonBodyOutputParams - for(Iterator<JsonNode> pathsElements = jsonNode.get("paths").elements(); pathsElements.hasNext(); ){ - JsonNode pathNode = pathsElements.next(); - String rpcOperation = pathNode.get("post").get("operationId").textValue(); - String bodyInputSchemaRef = pathNode.get("post").get("parameters").get(0).get("schema").get("properties").get("input").get("$ref").textValue(); - String bodyInputSchemaRefSuffix = JsonHelper.getStringSuffix(bodyInputSchemaRef,"/"); - rpcOperation = normalizeRpcOperation ? rpcOperation.replaceAll(Pattern.quote("-"),"").toLowerCase() : rpcOperation; - - String bodyOutputSchemaRef = pathNode.get("post").get("responses").get("200").get("schema").get("properties").get("output").get("$ref").textValue(); - String bodyOutputSchemaRefSuffix = JsonHelper.getStringSuffix(bodyOutputSchemaRef,"/"); - - Set<String> inputParametersOrSchemaRef; - Set<String> outputParametersOrSchemaRef; - if(populateType == PopulateType.SCHEMA_REF){ - inputParametersOrSchemaRef = new HashSet(); - inputParametersOrSchemaRef.add(bodyInputSchemaRefSuffix); - - outputParametersOrSchemaRef = new HashSet(); - outputParametersOrSchemaRef.add(bodyOutputSchemaRefSuffix); - }else{ - inputParametersOrSchemaRef = extractParams(jsonNode,bodyInputSchemaRefSuffix); - outputParametersOrSchemaRef = extractParams(jsonNode,bodyOutputSchemaRefSuffix); - } - jsonBodyInputParams.put(rpcOperation,inputParametersOrSchemaRef); - jsonBodyOutputParams.put(rpcOperation,outputParametersOrSchemaRef); - } - } - - private static Set<String> extractParams(final JsonNode jsonNode,String schemaRefName) { - Iterator<Map.Entry<String, JsonNode>> fields = jsonNode.get("definitions").get(schemaRefName).get("properties").fields(); - Set<String> params = new HashSet(); - for( ;fields.hasNext(); ){ - Map.Entry<String, JsonNode> fieldEntry = fields.next(); - params.add(fieldEntry.getKey()); - } - return params; - } - - public static String getStringSuffix(String input, String afterString){ - int indexOf = input.lastIndexOf(afterString); - String stringSuffix = (indexOf > -1) ? input.substring(indexOf+1) : input; - return stringSuffix; - } -} diff --git a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java b/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java deleted file mode 100644 index ff3a4ccb6..000000000 --- a/appc-client/client-kit/src/test/java/org/openecomp/appc/generator/yang2json/Yang2JsonGeneratorTest.java +++ /dev/null @@ -1,140 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APPC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Copyright (C) 2017 Amdocs - * ============================================================================= - * 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. - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * ============LICENSE_END========================================================= - */ - -package org.onap.appc.generator.yang2json; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.Optional; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.RpcDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException; -import org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver; -import org.onap.appc.generator.JsonHelper; - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.*; - -public class Yang2JsonGeneratorTest { - - private static SchemaContext yangSchema = null; - private static JsonNode jsonNode = null; - - public void readIOfiles() throws IOException{ - if(yangSchema == null){ - yangParse(); - } - if(jsonNode == null){ - jsonRead(); - } - - } - - public void testJsonRpcNum(){ - - int rpcYangNum = yangSchema.getModules().iterator().next().getRpcs().size(); - int rpcJsonNum = jsonNode.get("paths").size(); - Assert.assertTrue(rpcYangNum == rpcJsonNum); - } - - public void testJsonRpcsAndInOutParams(){ - - Map<String/*rpcOperation*/,Set<String> /*bodyInputParams*/> jsonBodyInputParams = new HashMap(); - Map<String/*rpcOperation*/,Set<String> /*bodyOutputParams*/> jsonBodyOutputParams= new HashMap(); - JsonHelper.populateRpcInputOutputParamsFromJson(jsonNode,jsonBodyInputParams, jsonBodyOutputParams); - - Set<RpcDefinition> rpcDefinitions = yangSchema.getModules().iterator().next().getRpcs(); - for(RpcDefinition rpcDef : rpcDefinitions){ - String rpcOperation = rpcDef.getQName().getLocalName(); - //verify all yang rpc operations & all input yang params/groupings exist in yang2json - Assert.assertTrue(jsonBodyInputParams.containsKey(rpcOperation)); - Collection<DataSchemaNode> inputChildNodes = rpcDef.getInput().getChildNodes(); - if(inputChildNodes != null || !inputChildNodes.isEmpty()) { - Assert.assertTrue(rpcOperation+": yang and yang2json input params size is not equal!",jsonBodyInputParams.get(rpcOperation).size() == inputChildNodes.size()); - Set<String> inputYangParams = getYangParams(inputChildNodes); - Assert.assertTrue(rpcOperation+": yang and yang2json input params are not same!",jsonBodyInputParams.get(rpcOperation).containsAll(inputYangParams)); - } - - //verify all yang rpc operations & all output yang params/groupings exist in yang2json - Assert.assertTrue(jsonBodyOutputParams.containsKey(rpcOperation)); - Collection<DataSchemaNode> outputChildNodes = rpcDef.getOutput().getChildNodes(); - if(outputChildNodes != null || !outputChildNodes.isEmpty()) { - Assert.assertTrue(rpcOperation+": yang and yang2json output params size is not equal!",jsonBodyOutputParams.get(rpcOperation).size()== outputChildNodes.size()); - Set<String> outputYangParams = getYangParams(outputChildNodes); - Assert.assertTrue(rpcOperation+": yang and yang2json output params are not same!",jsonBodyOutputParams.get(rpcOperation).containsAll(outputYangParams)); - } - } - } - - - private Set<String> getYangParams(Collection<DataSchemaNode> dataSchemaNodes) { - Set<String> yangParams = new HashSet(); - for(DataSchemaNode child : dataSchemaNodes){ - yangParams.add(child.getQName().getLocalName()); - } - return yangParams; - } - - - - private static void yangParse(){ - - try { - //sourceFileName - String yangFileName = System.getProperty("inputFile"); - YangTextSchemaContextResolver yangContextResolver = null; - yangContextResolver = YangTextSchemaContextResolver.create("yang-context-resolver"); - URL url = new File(yangFileName).toURI().toURL(); - yangContextResolver.registerSource(url); - Optional<SchemaContext> yangSchemaContext = yangContextResolver.getSchemaContext(); - yangSchema = yangSchemaContext.get(); - } catch (MalformedURLException e) { - e.printStackTrace(); - } catch (YangSyntaxErrorException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (SchemaSourceException e) { - e.printStackTrace(); - } - - - } - - - private static void jsonRead ()throws IOException { - String jsonFilePath = System.getProperty("outputFile"); - File file = new File(jsonFilePath); - ObjectMapper mapper = new ObjectMapper(); - jsonNode = mapper.readTree(file); - } -} |