diff options
Diffstat (limited to 'dcae-controller-service/dcae-controller-service-standardeventcollector')
45 files changed, 1537 insertions, 1463 deletions
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath index d2d34b3..0d82fb7 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="config"/> <classpathentry kind="src" output="target/classes" path="src/main/java"> <attributes> <attribute name="optional" value="true"/> @@ -21,7 +20,6 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/> <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF index 1424a21..9490d9c 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF @@ -5,11 +5,3 @@ Bundle-SymbolicName: dcae-controller-service-standardeventcollector-manager Bundle-Version: 0.1.0.qualifier Export-Package: org.openecomp.dcae.controller.service.standardeventcollector.manager.tools, org.openecomp.dcae.controller.service.standardeventcollector.servers.manager -Require-Bundle: ncomp-core-types, - ncomp-sirius-manager-model, - ncomp-sirius-manager-server, - ncomp-sirius-manager-console, - ncomp-sirius-manager-generator, - dcae-controller-service-standardeventcollector-model;bundle-version="0.1.0", - ncomp-utils-java;bundle-version="0.1.0", - dcae-controller-core-model diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java index d34bb3c..ab6114d 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java @@ -55,12 +55,13 @@ public class Generator { String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();
dir = "src/main/sirius-gen/" + dir.replace('.', '/');
ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
- m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+ m.setTemplateDirectory("../../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
m.setPrefix("Dcae");
m.setPluginName(p.getNsURI());
m.setName("ControllerServiceStandardeventcollectorManager");
m.setTitle("ControllerServiceStandardeventcollectorManager");
ControllerGenerator g = new ControllerGenerator(o, m);
+ g.setVersion("ONAP-R2"); g.setEnableIRequestHandler(false);
g.setEnableISiriusPlugin(true);
g.addFactory(ServiceFactory.eINSTANCE);
@@ -82,12 +83,13 @@ public class Generator { String dir = p.getNsURI().replaceAll(p.getNsPrefix()+"$", "") + "servers." + p.getNsPrefix();
dir = "src/main/sirius-gen/" + dir.replace('.', '/');
ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
- m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+ m.setTemplateDirectory("../../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
m.setPrefix("Dcae");
m.setPluginName(p.getNsURI());
m.setName("ControllerServiceStandardeventcollectorService");
m.setTitle("ControllerServiceStandardeventcollectorService");
ControllerGenerator g = new ControllerGenerator(o, m);
+ g.setVersion("ONAP-R2"); g.setEnableIRequestHandler(false);
g.setEnableISiriusPlugin(true);
g.setProvider(DockerFactory.eINSTANCE.createDockerService(), "Dcae");
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java index ea013e0..7922c0d 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java @@ -38,6 +38,7 @@ import org.openecomp.ncomp.sirius.manager.IRequestHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.sirius.function.FunctionUtils; +import org.openecomp.ncomp.utils.ShellCmd; import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; @@ -51,9 +52,17 @@ import java.util.List; + + + +import java.util.concurrent.TimeoutException; + import org.openecomp.dcae.controller.service.servers.dockermanager.DcaeDockerManagerProvider; import org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl; import org.openecomp.dcae.controller.service.standardeventcollector.manager.ControllerServiceStandardeventcollectorManager; +import org.openecomp.dcae.controller.core.service.HealthTestResponse; +import org.openecomp.dcae.controller.core.service.HealthTestStatus; +import org.openecomp.dcae.controller.core.service.impl.ServiceFactoryImpl; public class DcaeControllerServiceStandardeventcollectorManagerProvider extends DcaeDockerManagerProvider { @@ -67,8 +76,9 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends //private static final String HP_MAIN_CONFIG = "/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/HPProcessingConfig.json"; //private static final String HP_MAIN_CONFIG_COPY = "/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/HPProcessingConfig.json.copy"; - private static final String HP_MAIN_CONFIG = "/opt/app/SEC/etc/HPProcessingConfig.json"; - private static final String HP_MAIN_CONFIG_COPY = "/opt/app/SEC/etc/HPProcessingConfig.json"; + private static final String HP_MAIN_CONFIG = "/opt/app/VESCollector/etc/DmaapConfig.json"; + //private static final String HP_MAIN_CONFIG_COPY = "/opt/app/SEC/etc/DmaapConfig.json"; + public DcaeControllerServiceStandardeventcollectorManagerProvider(ISiriusServer controller, ControllerServiceStandardeventcollectorManager o) { @@ -97,6 +107,46 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends } + /** **/ + @Override + public HealthTestResponse test() { + super.start(); + HealthTestResponse resp = new ServiceFactoryImpl().createHealthTestResponse(); + String cmdOutput = ""; + try { + ShellCmd c = new ShellCmd("/opt/app/VESCollector/bin/VESrestfulCollector_Status.sh"); + String s = c.result(60000); + int i = s.indexOf("\n"); + System.out.println("DEBUG:HealthTestResponse i:" + i + " String S:" + s); + cmdOutput = i > 0 ? s.substring(0,i + 1) : s; + } catch (IOException | InterruptedException | TimeoutException e) { + System.out.println("HealthCheck test execution FAILED"); + // TODO Auto-generated catch block + e.printStackTrace(); + } + + System.out.println("test() VESCollecter check " + cmdOutput); + if (cmdOutput.startsWith("VESCollecter_Is_Running ")) { + resp.setStatus(HealthTestStatus.GREEN); + resp.setMessageCode("OK"); + logger.error("HealthTest: VESCollecter_Is_Running"); + System.out.println("INFO: HealthTest: VESCollecter_Is_Running"); + } else if (cmdOutput.startsWith("VESCollecter_Is_HavingError")) { + resp.setStatus(HealthTestStatus.YELLOW); + resp.setMessageCode("ERROR: VESCollecter_Is_HavingError"); + logger.error("HealthTest: VESCollecter_Is_HavingError"); + System.out.println("ERROR: HealthTest: VESCollecter_Is_HavingError"); + } else { + resp.setStatus(HealthTestStatus.RED); + resp.setMessageCode("ERROR: VESCollecter_Is_Not_Running"); + logger.error("HealthTest: VESCollecter_Is_Not_Running"); + System.out.println("ERROR: HealthTest: VESCollecter_Is_Not_Running"); + } + + return resp; + } + + @Override public void configurationChanged() { // important to call the super methods for handling DMaaP setup. @@ -128,7 +178,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends String cport = o.getCport(); if (cport !=null) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "collector.service.port" +" "+ cport; + cmd = "bin/VES_controller_update.sh " + "collector.service.port" +" "+ cport; executeCommand(cmd); } @@ -136,7 +186,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends String csecport = o.getCsecport(); if (csecport !=null) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "collector.service.secure.port" +" "+ csecport; + cmd = "bin/VES_controller_update.sh " + "collector.service.secure.port" +" "+ csecport; executeCommand(cmd); } @@ -144,85 +194,73 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends String keystoreloc = o.getKeystoreloc(); if (cport !=null) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "collector.keystore.file.location" +" "+ keystoreloc; + cmd = "bin/VES_controller_update.sh " + "collector.keystore.file.location" +" "+ keystoreloc; executeCommand(cmd); } - //Collector keystorepwd - String keystorepwd = o.getKeystorepwd(); + //Collector keystorepwdfile + String keystorepwdfile = o.getKeystorepwdloc(); if (cport !=null) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "collector.keystore.password" +" "+ keystorepwd; + cmd = "bin/VES_controller_update.sh " + "collector.keystore.passwordfile" +" "+ keystorepwdfile; executeCommand(cmd); } + //Collector keystorealias + String keystorealias = o.getKeystorealias(); + if (cport !=null) { + String cmd=""; + cmd = "bin/VES_controller_update.sh " + "collector.keystore.alias" +" "+ keystorealias; + executeCommand(cmd); + } //Collector maxinputqueue String maxinputqueue = o.getCport(); if (cport !=null) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "collector.inputQueue.maxPending" +" "+ maxinputqueue; + cmd = "bin/VES_controller_update.sh " + "collector.inputQueue.maxPending" +" "+ maxinputqueue; executeCommand(cmd); } - //authid - String authid = o.getAuthid(); - if (authid != null && !authid.equals("")) { - String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "header.authid" +" "+ authid; - executeCommand(cmd); - } else { - System.out.println("Auth ID is null"); - } - - //authpwd - String authpwd = o.getAuthpwd(); - if (authpwd != null && !authpwd.equals("")) { + //checkschemaflag + String checkschemaflag = o.getCheckschemaflag(); + if (checkschemaflag != null && !checkschemaflag.equals("")) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "header.authpwd" +" "+ authpwd; + cmd = "bin/VES_controller_update.sh " + "collector.schema.checkflag" +" "+ checkschemaflag; executeCommand(cmd); } else { - System.out.println("Auth Password is null"); + System.out.println("Schemaflag is null"); } - // Auth file - String authfile = o.getAuthfile(); - if (authfile != null && !authfile.equals("")) { + //authlist - replaces authid/pwd + String authlist = o.getAuthlist(); + if (authlist != null && !authlist.equals("")) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "header.authstore" +" "+ authfile; + cmd = "bin/VES_controller_update.sh " + "header.authlist" +" "+ authlist; executeCommand(cmd); } else { - System.out.println("authfile is null"); + System.out.println("authlist is null"); } - - // Auth Flag - String authflag = o.getAuthflag(); - if (authflag != null && !authflag.equals("")) { - String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "header.authflag" +" "+ authflag; - executeCommand(cmd); - } else { - System.out.println("authflag is null"); - } - - //checkschemaflag - String checkschemaflag = o.getCheckschemaflag(); - if (checkschemaflag != null && !checkschemaflag.equals("")) { + //StreamID + String streamid = o.getStreamid(); + if (streamid != null && !streamid.equals("")) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "collector.schema.checkflag" +" "+ checkschemaflag; + cmd = "bin/VES_controller_update.sh " + "collector.dmaap.streamid" +" "+ streamid; executeCommand(cmd); } else { - System.out.println("Schemaflag is null"); + System.out.println("streamid is null"); } + + // schemafile String schemafile = o.getSchemafile(); if (schemafile != null && !schemafile.equals("")) { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "collector.schema.file" +" "+ schemafile; + cmd = "bin/VES_controller_update.sh " + "collector.schema.file" +" "+ schemafile; executeCommand(cmd); } else { @@ -328,8 +366,8 @@ private JSONObject buildHpChannel(JSONObject tmpObj) { mrClass = "HpCambriaInputStream";// getDmaapClass(); } - //basicAuthUsername = tmpObj.getString("dmaapUserName"); - //basicAuthPassword = tmpObj.getString("dmaapPassword"); + basicAuthUsername = tmpObj.getString("dmaapUserName"); + basicAuthPassword = tmpObj.getString("dmaapPassword"); String dataTypeTmp = tmpObj.getString("dmaapDataType"); if (!dmaapDataType.equals(dataTypeTmp)) { System.out.println("Invalid DataType (non message) recieved" + dataTypeTmp ); @@ -337,15 +375,7 @@ private JSONObject buildHpChannel(JSONObject tmpObj) { } if (null != urlParts) { mrUrl = urlParts[2]; - - if (urlParts[3].equals("events")) - { - mrTopic = urlParts[4]; - } - else - { - mrTopic = urlParts[3]; - } + mrTopic = urlParts[4]; if (mrType.equals("subscribe") || mrType.equals("in")) { if (urlParts.length > 4) { hpGroup = urlParts[5]; @@ -358,16 +388,14 @@ private JSONObject buildHpChannel(JSONObject tmpObj) { hpName = tmpObj.getString("dmaapStreamId"); - String[] hostport = mrUrl.split(":"); hpC.put("name", hpName); hpC.put("type", mrType); hpC.put("class", mrClass); - //hpC.put("cambria.url", mrUrl); - hpC.put("cambria.hosts", hostport[0]); + hpC.put("cambria.url", mrUrl); hpC.put("cambria.topic", mrTopic); - //hpC.put("cambria.connectionType", sType); - //hpC.put("basicAuthUsername", basicAuthUsername); - //hpC.put("basicAuthPassword", basicAuthPassword); + hpC.put("cambria.connectionType", sType); + hpC.put("basicAuthUsername", basicAuthUsername); + hpC.put("basicAuthPassword", basicAuthPassword); if (mrType.equals("out")) { hpC.put("stripHpId", "true"); } else { @@ -433,7 +461,7 @@ private void updateJsonToHPConfig(String sourceName,String targetfile, JSONArray @Override public void start() { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "start"; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start"; executeCommand(cmd); // TODO IMPLEMENT @@ -443,7 +471,7 @@ private void updateJsonToHPConfig(String sourceName,String targetfile, JSONArray @Override public void suspend() { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "stop"; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop"; executeCommand(cmd); } @@ -451,11 +479,11 @@ private void updateJsonToHPConfig(String sourceName,String targetfile, JSONArray public void resume() { String cmd=""; - cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "stop"; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop"; executeCommand(cmd); cmd=""; - cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "start"; + cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start"; executeCommand(cmd); // TODO IMPLEMENT diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java index 8026f06..1dd8b09 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java @@ -61,7 +61,7 @@ public class DcaeControllerServiceStandardeventcollectorServiceProvider extends //EObject o1 = ManagerFactory.eINSTANCE.createControllerServiceStandardeventcollectorManager(); ControllerServiceStandardeventcollectorManager o1 = ManagerFactory.eINSTANCE.createControllerServiceStandardeventcollectorManager(); ManagementServer.copy(findInstance(instanceName),o1); - o1.setKeystorepwd(JavaHttpClient.decryptPassword(o1.getKeystorepwd())); + //o1.setKeystorepwd(JavaHttpClient.decryptPassword(o1.getKeystorepwd())); return o1; } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/Cec_controller_update.sh b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/Cec_controller_update.sh deleted file mode 100644 index 6edfa0e..0000000 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/Cec_controller_update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -paramName=$1 -paramValue=$2 -#localpropertyfile="/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/collector.properties" -#localadminscript="/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/bin/SErestfulCollector.sh" -#tmpfile="/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/collector.properties.tmp" - -localpropertyfile="/opt/app/SEC/etc/collector.properties" -localadminscript="/opt/app/SEC/bin/SErestfulCollector.sh" -tmpfile="/opt/app/SEC/etc/collector.properties.tmp" - - -echo $paramName -echo $paramValue - - - -case $1 in - "ADMIN") - echo $localadminscript $2 - $localadminscript $2 - ;; - *) - rm $tmpfile - sed "s~$paramName=.*~$paramName=$paramValue~g" $localpropertyfile > $tmpfile - echo `cat $tmpfile > $localpropertyfile` - rm $tmpfile - #$localadminscript stop - #$localadminscript start - ;; -esac -## To be modified for supporting DMAAP
\ No newline at end of file diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/VES_controller_update.sh b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/VES_controller_update.sh new file mode 100644 index 0000000..c69e734 --- /dev/null +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/VES_controller_update.sh @@ -0,0 +1,35 @@ +#!/bin/bash +paramName=$1 +paramValue=$2 + +localpropertyfile="/opt/app/VESCollector/etc/collector.properties" +localadminscript="/opt/app/VESCollector/bin/VESrestfulCollector.sh" +tmpfile="/opt/app/VESCollector/etc/collector.properties.tmp" +keystore="/opt/app/dcae-certificate/keystore.jks" +keypwdfile="/opt/app/dcae-certificate/.password" + +echo "paramName:" $paramName "paramValue:" $paramValue + + +case $1 in + "ADMIN") + echo $localadminscript $2 + $localadminscript $2 + ;; + *) + #rm $tmpfile + if [ $1 = "collector.keystore.alias" ]; then + tmpalias=`/usr/bin/keytool -list -keystore $keystore < $keypwdfile | grep "col" | cut -d"," -f1` + echo "tmpalias:" $tmpalias + alias=`echo $tmpalias | cut -d":" -f2` + echo "alias:" $alias + sed "s~$paramName=.*~$paramName=$alias~g" $localpropertyfile > $tmpfile + echo `cat $tmpfile > $localpropertyfile` + rm $tmpfile + else + sed "s~$paramName=.*~$paramName=$paramValue~g" $localpropertyfile > $tmpfile + echo `cat $tmpfile > $localpropertyfile` + rm $tmpfile + fi + ;; +esac diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml index 6ab6771..b969a3f 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml @@ -1,69 +1,57 @@ operations: - test: {} - suspend: {} - resume: {} - publicKey: {} - configurationChanged: {} - updateStreams: {} - REMOTE_test: - decription: Remote call test - REMOTE_suspend: - decription: Remote call suspend - REMOTE_resume: - decription: Remote call resume - REMOTE_publicKey: - decription: Remote call publicKey - REMOTE_configurationChanged: - decription: Remote call configurationChanged - REMOTE_updateStreams: - decription: Remote call updateStreams + ControllerServiceStandardeventcollectorManager@test: {} + ControllerServiceStandardeventcollectorManager@suspend: {} + ControllerServiceStandardeventcollectorManager@resume: {} + ControllerServiceStandardeventcollectorManager@publicKey: {} + ControllerServiceStandardeventcollectorManager@configurationChanged: {} + ControllerServiceStandardeventcollectorManager@updateStreams: {} messages: dummy: {} - test: - errorCode: test-FAILED-5001W + REQUEST-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - suspend: - errorCode: suspend-FAILED-5001W + REQUEST-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - resume: - errorCode: resume-FAILED-5001W + REQUEST-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - publicKey: - errorCode: publicKey-FAILED-5001W + REQUEST-FAILED-publicKey: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - configurationChanged: - errorCode: configurationChanged-FAILED-5001W + REQUEST-FAILED-configurationChanged: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateStreams: - errorCode: updateStreams-FAILED-5001W + REQUEST-FAILED-updateStreams: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_test: - errorCode: REMOTE-test-FAILED-5001W + REMOTE-CALL-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_suspend: - errorCode: REMOTE-suspend-FAILED-5001W + REMOTE-CALL-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_resume: - errorCode: REMOTE-resume-FAILED-5001W + REMOTE-CALL-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_publicKey: - errorCode: REMOTE-publicKey-FAILED-5001W + REMOTE-CALL-FAILED-publicKey: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_configurationChanged: - errorCode: REMOTE-configurationChanged-FAILED-5001W + REMOTE-CALL-FAILED-configurationChanged: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateStreams: - errorCode: REMOTE-updateStreams-FAILED-5001W + REMOTE-CALL-FAILED-updateStreams: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml index c449feb..2f032a1 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml @@ -1,124 +1,102 @@ operations: - deploy: {} - undeploy: {} - test: {} - suspend: {} - resume: {} - pushManagerConfiguration: {} - pollManagerConfiguration: {} - managerConfiguration: {} - managerOperation: {} - updateConfigurationFromPolicy: {} - runHealthTests: {} - REMOTE_deploy: - decription: Remote call deploy - REMOTE_undeploy: - decription: Remote call undeploy - REMOTE_test: - decription: Remote call test - REMOTE_suspend: - decription: Remote call suspend - REMOTE_resume: - decription: Remote call resume - REMOTE_pushManagerConfiguration: - decription: Remote call pushManagerConfiguration - REMOTE_pollManagerConfiguration: - decription: Remote call pollManagerConfiguration - REMOTE_managerConfiguration: - decription: Remote call managerConfiguration - REMOTE_managerOperation: - decription: Remote call managerOperation - REMOTE_updateConfigurationFromPolicy: - decription: Remote call updateConfigurationFromPolicy - REMOTE_runHealthTests: - decription: Remote call runHealthTests + ControllerServiceStandardeventcollectorService@deploy: {} + ControllerServiceStandardeventcollectorService@undeploy: {} + ControllerServiceStandardeventcollectorService@test: {} + ControllerServiceStandardeventcollectorService@suspend: {} + ControllerServiceStandardeventcollectorService@resume: {} + ControllerServiceStandardeventcollectorService@pushManagerConfiguration: {} + ControllerServiceStandardeventcollectorService@pollManagerConfiguration: {} + ControllerServiceStandardeventcollectorService@managerConfiguration: {} + ControllerServiceStandardeventcollectorService@managerOperation: {} + ControllerServiceStandardeventcollectorService@updateConfigurationFromPolicy: {} + ControllerServiceStandardeventcollectorService@runHealthTests: {} messages: dummy: {} - deploy: - errorCode: deploy-FAILED-5001W + REQUEST-FAILED-deploy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - undeploy: - errorCode: undeploy-FAILED-5001W + REQUEST-FAILED-undeploy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - test: - errorCode: test-FAILED-5001W + REQUEST-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - suspend: - errorCode: suspend-FAILED-5001W + REQUEST-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - resume: - errorCode: resume-FAILED-5001W + REQUEST-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pushManagerConfiguration: - errorCode: pushManagerConfiguration-FAILED-5001W + REQUEST-FAILED-pushManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pollManagerConfiguration: - errorCode: pollManagerConfiguration-FAILED-5001W + REQUEST-FAILED-pollManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - managerConfiguration: - errorCode: managerConfiguration-FAILED-5001W + REQUEST-FAILED-managerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - managerOperation: - errorCode: managerOperation-FAILED-5001W + REQUEST-FAILED-managerOperation: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateConfigurationFromPolicy: - errorCode: updateConfigurationFromPolicy-FAILED-5001W + REQUEST-FAILED-updateConfigurationFromPolicy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - runHealthTests: - errorCode: runHealthTests-FAILED-5001W + REQUEST-FAILED-runHealthTests: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_deploy: - errorCode: REMOTE-deploy-FAILED-5001W + REMOTE-CALL-FAILED-deploy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_undeploy: - errorCode: REMOTE-undeploy-FAILED-5001W + REMOTE-CALL-FAILED-undeploy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_test: - errorCode: REMOTE-test-FAILED-5001W + REMOTE-CALL-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_suspend: - errorCode: REMOTE-suspend-FAILED-5001W + REMOTE-CALL-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_resume: - errorCode: REMOTE-resume-FAILED-5001W + REMOTE-CALL-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pushManagerConfiguration: - errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-pushManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pollManagerConfiguration: - errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-pollManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_managerConfiguration: - errorCode: REMOTE-managerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-managerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_managerOperation: - errorCode: REMOTE-managerOperation-FAILED-5001W + REMOTE-CALL-FAILED-managerOperation: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateConfigurationFromPolicy: - errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W + REMOTE-CALL-FAILED-updateConfigurationFromPolicy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_runHealthTests: - errorCode: REMOTE-runHealthTests-FAILED-5001W + REMOTE-CALL-FAILED-runHealthTests: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml index bf3d69d..1489339 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml @@ -1,69 +1,57 @@ operations: - getTree: {} - getObject: {} - getTimeSerie: {} - getTable: {} - getHtml: {} - getGraph: {} - REMOTE_getTree: - decription: Remote call getTree - REMOTE_getObject: - decription: Remote call getObject - REMOTE_getTimeSerie: - decription: Remote call getTimeSerie - REMOTE_getTable: - decription: Remote call getTable - REMOTE_getHtml: - decription: Remote call getHtml - REMOTE_getGraph: - decription: Remote call getGraph + GuiClientApi@getTree: {} + GuiClientApi@getObject: {} + GuiClientApi@getTimeSerie: {} + GuiClientApi@getTable: {} + GuiClientApi@getHtml: {} + GuiClientApi@getGraph: {} messages: dummy: {} - getTree: - errorCode: getTree-FAILED-5001W + REQUEST-FAILED-getTree: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getObject: - errorCode: getObject-FAILED-5001W + REQUEST-FAILED-getObject: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getTimeSerie: - errorCode: getTimeSerie-FAILED-5001W + REQUEST-FAILED-getTimeSerie: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getTable: - errorCode: getTable-FAILED-5001W + REQUEST-FAILED-getTable: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getHtml: - errorCode: getHtml-FAILED-5001W + REQUEST-FAILED-getHtml: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getGraph: - errorCode: getGraph-FAILED-5001W + REQUEST-FAILED-getGraph: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_getTree: - errorCode: REMOTE-getTree-FAILED-5001W + REMOTE-CALL-FAILED-getTree: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getObject: - errorCode: REMOTE-getObject-FAILED-5001W + REMOTE-CALL-FAILED-getObject: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getTimeSerie: - errorCode: REMOTE-getTimeSerie-FAILED-5001W + REMOTE-CALL-FAILED-getTimeSerie: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getTable: - errorCode: REMOTE-getTable-FAILED-5001W + REMOTE-CALL-FAILED-getTable: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getHtml: - errorCode: REMOTE-getHtml-FAILED-5001W + REMOTE-CALL-FAILED-getHtml: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getGraph: - errorCode: REMOTE-getGraph-FAILED-5001W + REMOTE-CALL-FAILED-getGraph: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java index 3014ce6..17fcd51 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java @@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.man + + import java.io.InputStream; import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; -import org.openecomp.logger.EcompLogger; +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; import java.util.Date; import org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging.ControllerServiceStandardeventcollectorManagerOperationEnum; +import org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging.ControllerServiceStandardeventcollectorManagerMessageEnum; @@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.standardeventcollector.manager.impl -public class DcaeControllerServiceStandardeventcollectorManager extends ControllerServiceStandardeventcollectorManagerImpl implements ISiriusPlugin { +public class DcaeControllerServiceStandardeventcollectorManager extends ControllerServiceStandardeventcollectorManagerImpl implements ISiriusProvider, ISiriusPlugin { public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorManager.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeControllerServiceStandardeventcollectorManagerProvider controller; ISiriusServer server; @@ -68,8 +78,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.test); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_test,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_test,"self:" + ManagementServer.object2ref(this)); try { res = controller.test(); } @@ -78,7 +88,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_test, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -93,8 +106,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.suspend); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_suspend,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_suspend,"self:" + ManagementServer.object2ref(this)); try { controller.suspend(); } @@ -103,7 +116,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -118,8 +134,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.resume); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_resume,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_resume,"self:" + ManagementServer.object2ref(this)); try { controller.resume(); } @@ -128,7 +144,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -143,8 +162,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.publicKey); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_publicKey,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_publicKey,"self:" + ManagementServer.object2ref(this)); try { res = controller.publicKey(); } @@ -153,7 +172,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -168,8 +190,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.configurationChanged); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_configurationChanged,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_configurationChanged,"self:" + ManagementServer.object2ref(this)); try { controller.configurationChanged(); } @@ -178,7 +200,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -193,8 +218,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.updateStreams); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_updateStreams,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_updateStreams,"self:" + ManagementServer.object2ref(this)); try { controller.updateStreams(inputStreams,outputStreams); } @@ -203,7 +228,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll if (server != null) server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -217,6 +245,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll + + @Override public void start() { controller.start(); @@ -225,7 +255,7 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll public static void ecoreSetup() { DcaeControllerServiceStandardeventcollectorManagerProvider.ecoreSetup(); } - public DcaeControllerServiceStandardeventcollectorManagerProvider getSomfProvider() { + public DcaeControllerServiceStandardeventcollectorManagerProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java index 17c4ce0..6140d03 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java @@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -54,33 +56,37 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co DcaeControllerServiceStandardeventcollectorManager.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeControllerServiceStandardeventcollectorManagerClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeControllerServiceStandardeventcollectorManagerClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public org.openecomp.dcae.controller.core.service.HealthTestResponse test() { - EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_test); + EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_test,client.getRemote()); org.openecomp.dcae.controller.core.service.HealthTestResponse res; try { res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_test, e.toString()); - throw new RuntimeException("remote call failed: test", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -88,16 +94,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co @Override public void suspend() { - EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_suspend); + EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_suspend,client.getRemote()); try { client.operationPath("/resources", c, "suspend", null); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_suspend, e.toString()); - throw new RuntimeException("remote call failed: suspend", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -105,16 +112,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co @Override public void resume() { - EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_resume); + EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_resume,client.getRemote()); try { client.operationPath("/resources", c, "resume", null); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_resume, e.toString()); - throw new RuntimeException("remote call failed: resume", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -122,16 +130,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co @Override public java.lang.String publicKey() { - EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_publicKey); + EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_publicKey,client.getRemote()); java.lang.String res; try { res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_publicKey, e.toString()); - throw new RuntimeException("remote call failed: publicKey", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -139,16 +148,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co @Override public void configurationChanged() { - EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_configurationChanged); + EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_configurationChanged,client.getRemote()); try { client.operationPath("/resources", c, "configurationChanged", null); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_configurationChanged, e.toString()); - throw new RuntimeException("remote call failed: configurationChanged", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -156,16 +166,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co @Override public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) { - EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_updateStreams); + EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_updateStreams,client.getRemote()); try { client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_updateStreams, e.toString()); - throw new RuntimeException("remote call failed: updateStreams", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java index bab474a..faba4e1 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java @@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.man import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; import java.util.TimeZone; import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EFactory; - -import org.openecomp.entity.EcompComponent; -import org.openecomp.entity.EcompSubComponent; -import org.openecomp.entity.EcompSubComponentInstance; +import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.Jetty8Server; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.IRequestHandler; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.dcae.controller.service.standardeventcollector.manager.ControllerServiceStandardeventcollectorManager; @@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.standardeventcollector.servers.mana -public class DcaeControllerServiceStandardeventcollectorManagerServer implements ISiriusServer { +public class DcaeControllerServiceStandardeventcollectorManagerServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorManagerServer.class); String serverPath; ManagementServer server; @@ -69,6 +68,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerServer implements props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "ControllerServiceStandardeventcollectorManager", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addFactory(org.openecomp.dcae.controller.service.standardeventcollector.service.ServiceFactory.eINSTANCE); @@ -81,6 +81,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerServer implements controller = (DcaeControllerServiceStandardeventcollectorManager) server.find("/").o; webServer = new Jetty8Server("manager.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -109,4 +110,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerServer implements public ManagementServer getServer() { return server; } + public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, + String clientVersion) { + switch ((String) context.get("path")) { + case "/api/versions": + return server.supportedVersions(); + } + logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2)); + throw new RuntimeException("Unknown request"); + } + public Object handleBinary(String userName, String action, String resourcePath, InputStream in) { + return null; + } + } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java index 2f96918..4c07551 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java @@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.man + + import java.io.InputStream; import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; -import org.openecomp.logger.EcompLogger; +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; import java.util.Date; import org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging.GuiClientApiOperationEnum; +import org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging.GuiClientApiMessageEnum; @@ -81,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; -public class DcaeGuiClientApi extends GuiClientApiImpl { +public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeGuiClientApiProvider controller; ISiriusServer server; @@ -98,8 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getTree); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTree(); } @@ -108,7 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -123,8 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getObject); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this)); try { res = controller.getObject(path); } @@ -133,7 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -148,8 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.START, duration_,path,start,end,duration); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getTimeSerie); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTimeSerie(path,start,end,duration); } @@ -158,7 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -173,8 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getTable); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTable(path,start,end); } @@ -183,7 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -198,8 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getHtml); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this)); try { res = controller.getHtml(path,start,end); } @@ -208,7 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -223,8 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getGraph); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this)); try { res = controller.getGraph(path,start,end); } @@ -233,7 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -247,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { + + public static void ecoreSetup() { DcaeGuiClientApiProvider.ecoreSetup(); } - public DcaeGuiClientApiProvider getSomfProvider() { + public DcaeGuiClientApiProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java index dbbdf22..e507b7c 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java @@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { DcaeControllerServiceStandardeventcollectorManager.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/gui", this); + client.setVersion("ONAP-R2"); } public DcaeGuiClientApiClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/gui", this); + client.setVersion("ONAP-R2"); } public DcaeGuiClientApiClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString()); - throw new RuntimeException("remote call failed: getTree", e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getObject); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString()); - throw new RuntimeException("remote call failed: getObject", e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTimeSerie); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString()); - throw new RuntimeException("remote call failed: getTimeSerie", e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTable); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString()); - throw new RuntimeException("remote call failed: getTable", e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getHtml); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString()); - throw new RuntimeException("remote call failed: getHtml", e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getGraph); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote()); org.openecomp.ncomp.sirius.manager.graph.GuiGraph res; try { res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString()); - throw new RuntimeException("remote call failed: getGraph", e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties index 8705ab8..3822d29 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties @@ -1,78 +1,78 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -getTree=\ - getTree-FAILED-5001W|\ +REQUEST_FAILED_getTree=\ + REQUEST-FAILED-getTree-4001W|\ {0}|\ null|\ Operation Failed with Exception -getObject=\ - getObject-FAILED-5001W|\ +REQUEST_FAILED_getObject=\ + REQUEST-FAILED-getObject-4001W|\ {0}|\ null|\ Operation Failed with Exception -getTimeSerie=\ - getTimeSerie-FAILED-5001W|\ +REQUEST_FAILED_getTimeSerie=\ + REQUEST-FAILED-getTimeSerie-4001W|\ {0}|\ null|\ Operation Failed with Exception -getTable=\ - getTable-FAILED-5001W|\ +REQUEST_FAILED_getTable=\ + REQUEST-FAILED-getTable-4001W|\ {0}|\ null|\ Operation Failed with Exception -getHtml=\ - getHtml-FAILED-5001W|\ +REQUEST_FAILED_getHtml=\ + REQUEST-FAILED-getHtml-4001W|\ {0}|\ null|\ Operation Failed with Exception -getGraph=\ - getGraph-FAILED-5001W|\ +REQUEST_FAILED_getGraph=\ + REQUEST-FAILED-getGraph-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_getTree=\ - REMOTE-getTree-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTree=\ + REMOTE-CALL-FAILED-getTree-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getObject=\ - REMOTE-getObject-FAILED-5001W|\ +REMOTE_CALL_FAILED_getObject=\ + REMOTE-CALL-FAILED-getObject-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getTimeSerie=\ - REMOTE-getTimeSerie-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTimeSerie=\ + REMOTE-CALL-FAILED-getTimeSerie-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getTable=\ - REMOTE-getTable-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTable=\ + REMOTE-CALL-FAILED-getTable-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getHtml=\ - REMOTE-getHtml-FAILED-5001W|\ +REMOTE_CALL_FAILED_getHtml=\ + REMOTE-CALL-FAILED-getHtml-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getGraph=\ - REMOTE-getGraph-FAILED-5001W|\ +REMOTE_CALL_FAILED_getGraph=\ + REMOTE-CALL-FAILED-getGraph-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java index 8cf3235..46f787f 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * 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.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum; public enum GuiClientApiMessageEnum implements EcompMessageEnum { dummy, - getTree, - getObject, - getTimeSerie, - getTable, - getHtml, - getGraph, - REMOTE_getTree, - REMOTE_getObject, - REMOTE_getTimeSerie, - REMOTE_getTable, - REMOTE_getHtml, - REMOTE_getGraph; + REQUEST_FAILED_getTree, + REQUEST_FAILED_getObject, + REQUEST_FAILED_getTimeSerie, + REQUEST_FAILED_getTable, + REQUEST_FAILED_getHtml, + REQUEST_FAILED_getGraph, + REMOTE_CALL_FAILED_getTree, + REMOTE_CALL_FAILED_getObject, + REMOTE_CALL_FAILED_getTimeSerie, + REMOTE_CALL_FAILED_getTable, + REMOTE_CALL_FAILED_getHtml, + REMOTE_CALL_FAILED_getGraph; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging.GuiClientApi"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi"); } } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java index c1e38aa..90c1ec1 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java @@ -1,41 +1,27 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * 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.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging; import org.openecomp.entity.EcompOperationEnum; public enum GuiClientApiOperationEnum implements EcompOperationEnum { - getTree, - getObject, - getTimeSerie, - getTable, - getHtml, - getGraph, - REMOTE_getTree, - REMOTE_getObject, - REMOTE_getTimeSerie, - REMOTE_getTable, - REMOTE_getHtml, - REMOTE_getGraph; + GuiClientApi_getTree("GuiClientApi@getTree"), + GuiClientApi_getObject("GuiClientApi@getObject"), + GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"), + GuiClientApi_getTable("GuiClientApi@getTable"), + GuiClientApi_getHtml("GuiClientApi@getHtml"), + GuiClientApi_getGraph("GuiClientApi@getGraph") ; + + + private String n; + + private GuiClientApiOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties index ef19f9b..4580ed4 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties @@ -1,78 +1,78 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -test=\ - test-FAILED-5001W|\ +REQUEST_FAILED_test=\ + REQUEST-FAILED-test-4001W|\ {0}|\ null|\ Operation Failed with Exception -suspend=\ - suspend-FAILED-5001W|\ +REQUEST_FAILED_suspend=\ + REQUEST-FAILED-suspend-4001W|\ {0}|\ null|\ Operation Failed with Exception -resume=\ - resume-FAILED-5001W|\ +REQUEST_FAILED_resume=\ + REQUEST-FAILED-resume-4001W|\ {0}|\ null|\ Operation Failed with Exception -publicKey=\ - publicKey-FAILED-5001W|\ +REQUEST_FAILED_publicKey=\ + REQUEST-FAILED-publicKey-4001W|\ {0}|\ null|\ Operation Failed with Exception -configurationChanged=\ - configurationChanged-FAILED-5001W|\ +REQUEST_FAILED_configurationChanged=\ + REQUEST-FAILED-configurationChanged-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateStreams=\ - updateStreams-FAILED-5001W|\ +REQUEST_FAILED_updateStreams=\ + REQUEST-FAILED-updateStreams-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_test=\ - REMOTE-test-FAILED-5001W|\ +REMOTE_CALL_FAILED_test=\ + REMOTE-CALL-FAILED-test-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_suspend=\ - REMOTE-suspend-FAILED-5001W|\ +REMOTE_CALL_FAILED_suspend=\ + REMOTE-CALL-FAILED-suspend-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_resume=\ - REMOTE-resume-FAILED-5001W|\ +REMOTE_CALL_FAILED_resume=\ + REMOTE-CALL-FAILED-resume-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_publicKey=\ - REMOTE-publicKey-FAILED-5001W|\ +REMOTE_CALL_FAILED_publicKey=\ + REMOTE-CALL-FAILED-publicKey-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_configurationChanged=\ - REMOTE-configurationChanged-FAILED-5001W|\ +REMOTE_CALL_FAILED_configurationChanged=\ + REMOTE-CALL-FAILED-configurationChanged-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateStreams=\ - REMOTE-updateStreams-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateStreams=\ + REMOTE-CALL-FAILED-updateStreams-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java index 63cf554..d09ef72 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * 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.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum; public enum ControllerServiceStandardeventcollectorManagerMessageEnum implements EcompMessageEnum { dummy, - test, - suspend, - resume, - publicKey, - configurationChanged, - updateStreams, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_publicKey, - REMOTE_configurationChanged, - REMOTE_updateStreams; + REQUEST_FAILED_test, + REQUEST_FAILED_suspend, + REQUEST_FAILED_resume, + REQUEST_FAILED_publicKey, + REQUEST_FAILED_configurationChanged, + REQUEST_FAILED_updateStreams, + REMOTE_CALL_FAILED_test, + REMOTE_CALL_FAILED_suspend, + REMOTE_CALL_FAILED_resume, + REMOTE_CALL_FAILED_publicKey, + REMOTE_CALL_FAILED_configurationChanged, + REMOTE_CALL_FAILED_updateStreams; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging.ControllerServiceStandardeventcollectorManager"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager"); } } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java index f15b357..5d2f6b5 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java @@ -1,41 +1,27 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * 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.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging; import org.openecomp.entity.EcompOperationEnum; public enum ControllerServiceStandardeventcollectorManagerOperationEnum implements EcompOperationEnum { - test, - suspend, - resume, - publicKey, - configurationChanged, - updateStreams, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_publicKey, - REMOTE_configurationChanged, - REMOTE_updateStreams; + ControllerServiceStandardeventcollectorManager_test("ControllerServiceStandardeventcollectorManager@test"), + ControllerServiceStandardeventcollectorManager_suspend("ControllerServiceStandardeventcollectorManager@suspend"), + ControllerServiceStandardeventcollectorManager_resume("ControllerServiceStandardeventcollectorManager@resume"), + ControllerServiceStandardeventcollectorManager_publicKey("ControllerServiceStandardeventcollectorManager@publicKey"), + ControllerServiceStandardeventcollectorManager_configurationChanged("ControllerServiceStandardeventcollectorManager@configurationChanged"), + ControllerServiceStandardeventcollectorManager_updateStreams("ControllerServiceStandardeventcollectorManager@updateStreams") ; + + + private String n; + + private ControllerServiceStandardeventcollectorManagerOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java index 24aac3f..51dc413 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java @@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.ser + + import java.io.InputStream; import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; -import org.openecomp.logger.EcompLogger; +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; import java.util.Date; import org.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging.ControllerServiceStandardeventcollectorServiceOperationEnum; +import org.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging.ControllerServiceStandardeventcollectorServiceMessageEnum; @@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.standardeventcollector.service.impl -public class DcaeControllerServiceStandardeventcollectorService extends ControllerServiceStandardeventcollectorServiceImpl implements ISiriusPlugin { +public class DcaeControllerServiceStandardeventcollectorService extends ControllerServiceStandardeventcollectorServiceImpl implements ISiriusProvider, ISiriusPlugin { public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorService.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeControllerServiceStandardeventcollectorServiceProvider controller; ISiriusServer server; @@ -68,8 +78,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.deploy); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_deploy,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_deploy,"self:" + ManagementServer.object2ref(this)); try { controller.deploy(instanceName,containerPath); } @@ -78,7 +88,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_deploy, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -93,8 +106,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.undeploy); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_undeploy,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_undeploy,"self:" + ManagementServer.object2ref(this)); try { controller.undeploy(instanceName); } @@ -103,7 +116,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -118,8 +134,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.test); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_test,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_test,"self:" + ManagementServer.object2ref(this)); try { res = controller.test(instanceName); } @@ -128,7 +144,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_test, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -143,8 +162,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.suspend); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_suspend,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_suspend,"self:" + ManagementServer.object2ref(this)); try { controller.suspend(instanceName); } @@ -153,7 +172,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -168,8 +190,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.resume); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_resume,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_resume,"self:" + ManagementServer.object2ref(this)); try { controller.resume(instanceName); } @@ -178,7 +200,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -193,8 +218,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.pushManagerConfiguration); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pushManagerConfiguration,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.pushManagerConfiguration(instanceName); } @@ -203,7 +228,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -218,8 +246,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.pollManagerConfiguration); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pollManagerConfiguration,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.pollManagerConfiguration(instanceName); } @@ -228,7 +256,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -243,8 +274,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.managerConfiguration); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerConfiguration,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerConfiguration,"self:" + ManagementServer.object2ref(this)); try { res = controller.managerConfiguration(instanceName); } @@ -253,7 +284,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -268,8 +302,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.managerOperation); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerOperation,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerOperation,"self:" + ManagementServer.object2ref(this)); try { res = controller.managerOperation(instanceName,operation,parameters); } @@ -278,7 +312,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -293,8 +330,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.updateConfigurationFromPolicy); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this)); try { controller.updateConfigurationFromPolicy(instanceName); } @@ -303,7 +340,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -318,8 +358,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.runHealthTests); + ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_runHealthTests,server,this); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_runHealthTests,"self:" + ManagementServer.object2ref(this)); try { controller.runHealthTests(); } @@ -328,7 +368,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll if (server != null) server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -342,6 +385,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll + + @Override public void start() { controller.start(); @@ -350,7 +395,7 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll public static void ecoreSetup() { DcaeControllerServiceStandardeventcollectorServiceProvider.ecoreSetup(); } - public DcaeControllerServiceStandardeventcollectorServiceProvider getSomfProvider() { + public DcaeControllerServiceStandardeventcollectorServiceProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java index 329a18e..cbc99d4 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java @@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -54,33 +56,37 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co DcaeControllerServiceStandardeventcollectorService.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeControllerServiceStandardeventcollectorServiceClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeControllerServiceStandardeventcollectorServiceClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public void deploy(java.lang.String instanceName, java.lang.String containerPath) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_deploy); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_deploy,client.getRemote()); try { client.operationPath("/resources", c, "deploy", null, instanceName,containerPath); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_deploy, e.toString()); - throw new RuntimeException("remote call failed: deploy", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -88,16 +94,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public void undeploy(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_undeploy); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_undeploy,client.getRemote()); try { client.operationPath("/resources", c, "undeploy", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_undeploy, e.toString()); - throw new RuntimeException("remote call failed: undeploy", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -105,16 +112,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_test); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_test,client.getRemote()); org.openecomp.dcae.controller.core.service.HealthTestResponse res; try { res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_test, e.toString()); - throw new RuntimeException("remote call failed: test", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -122,16 +130,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public void suspend(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_suspend); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_suspend,client.getRemote()); try { client.operationPath("/resources", c, "suspend", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_suspend, e.toString()); - throw new RuntimeException("remote call failed: suspend", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -139,16 +148,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public void resume(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_resume); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_resume,client.getRemote()); try { client.operationPath("/resources", c, "resume", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_resume, e.toString()); - throw new RuntimeException("remote call failed: resume", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -156,16 +166,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public void pushManagerConfiguration(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_pushManagerConfiguration); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pushManagerConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: pushManagerConfiguration", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -173,16 +184,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public void pollManagerConfiguration(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_pollManagerConfiguration); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pollManagerConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: pollManagerConfiguration", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -190,16 +202,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_managerConfiguration); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerConfiguration,client.getRemote()); org.eclipse.emf.ecore.EObject res; try { res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_managerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: managerConfiguration", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -207,16 +220,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_managerOperation); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerOperation,client.getRemote()); org.json.JSONObject res; try { res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_managerOperation, e.toString()); - throw new RuntimeException("remote call failed: managerOperation", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -224,16 +238,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public void updateConfigurationFromPolicy(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_updateConfigurationFromPolicy); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy,client.getRemote()); try { client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString()); - throw new RuntimeException("remote call failed: updateConfigurationFromPolicy", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -241,16 +256,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co @Override public void runHealthTests() { - EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_runHealthTests); + EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); + ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_runHealthTests,client.getRemote()); try { client.operationPath("/resources", c, "runHealthTests", null); } catch (Exception e) { - ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_runHealthTests, e.toString()); - throw new RuntimeException("remote call failed: runHealthTests", e); + ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString()); + EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java index 0f7ffa4..4a56e1a 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java @@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.ser import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; import java.util.TimeZone; import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EFactory; - -import org.openecomp.entity.EcompComponent; -import org.openecomp.entity.EcompSubComponent; -import org.openecomp.entity.EcompSubComponentInstance; +import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.Jetty8Server; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.IRequestHandler; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorService; @@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.standardeventcollector.service.Cont -public class DcaeControllerServiceStandardeventcollectorServiceServer implements ISiriusServer { +public class DcaeControllerServiceStandardeventcollectorServiceServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorServiceServer.class); String serverPath; ManagementServer server; @@ -64,6 +63,7 @@ public class DcaeControllerServiceStandardeventcollectorServiceServer implements props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "ControllerServiceStandardeventcollectorService", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addRuntimeFactories(this); @@ -73,6 +73,7 @@ public class DcaeControllerServiceStandardeventcollectorServiceServer implements controller = (DcaeControllerServiceStandardeventcollectorService) server.find("/").o; webServer = new Jetty8Server("service.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -95,4 +96,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceServer implements public ManagementServer getServer() { return server; } + public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, + String clientVersion) { + switch ((String) context.get("path")) { + case "/api/versions": + return server.supportedVersions(); + } + logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2)); + throw new RuntimeException("Unknown request"); + } + public Object handleBinary(String userName, String action, String resourcePath, InputStream in) { + return null; + } + } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties index 13a57d6..f3a3955 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties @@ -1,138 +1,138 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -deploy=\ - deploy-FAILED-5001W|\ +REQUEST_FAILED_deploy=\ + REQUEST-FAILED-deploy-4001W|\ {0}|\ null|\ Operation Failed with Exception -undeploy=\ - undeploy-FAILED-5001W|\ +REQUEST_FAILED_undeploy=\ + REQUEST-FAILED-undeploy-4001W|\ {0}|\ null|\ Operation Failed with Exception -test=\ - test-FAILED-5001W|\ +REQUEST_FAILED_test=\ + REQUEST-FAILED-test-4001W|\ {0}|\ null|\ Operation Failed with Exception -suspend=\ - suspend-FAILED-5001W|\ +REQUEST_FAILED_suspend=\ + REQUEST-FAILED-suspend-4001W|\ {0}|\ null|\ Operation Failed with Exception -resume=\ - resume-FAILED-5001W|\ +REQUEST_FAILED_resume=\ + REQUEST-FAILED-resume-4001W|\ {0}|\ null|\ Operation Failed with Exception -pushManagerConfiguration=\ - pushManagerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_pushManagerConfiguration=\ + REQUEST-FAILED-pushManagerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -pollManagerConfiguration=\ - pollManagerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_pollManagerConfiguration=\ + REQUEST-FAILED-pollManagerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -managerConfiguration=\ - managerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_managerConfiguration=\ + REQUEST-FAILED-managerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -managerOperation=\ - managerOperation-FAILED-5001W|\ +REQUEST_FAILED_managerOperation=\ + REQUEST-FAILED-managerOperation-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateConfigurationFromPolicy=\ - updateConfigurationFromPolicy-FAILED-5001W|\ +REQUEST_FAILED_updateConfigurationFromPolicy=\ + REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\ {0}|\ null|\ Operation Failed with Exception -runHealthTests=\ - runHealthTests-FAILED-5001W|\ +REQUEST_FAILED_runHealthTests=\ + REQUEST-FAILED-runHealthTests-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_deploy=\ - REMOTE-deploy-FAILED-5001W|\ +REMOTE_CALL_FAILED_deploy=\ + REMOTE-CALL-FAILED-deploy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_undeploy=\ - REMOTE-undeploy-FAILED-5001W|\ +REMOTE_CALL_FAILED_undeploy=\ + REMOTE-CALL-FAILED-undeploy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_test=\ - REMOTE-test-FAILED-5001W|\ +REMOTE_CALL_FAILED_test=\ + REMOTE-CALL-FAILED-test-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_suspend=\ - REMOTE-suspend-FAILED-5001W|\ +REMOTE_CALL_FAILED_suspend=\ + REMOTE-CALL-FAILED-suspend-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_resume=\ - REMOTE-resume-FAILED-5001W|\ +REMOTE_CALL_FAILED_resume=\ + REMOTE-CALL-FAILED-resume-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pushManagerConfiguration=\ - REMOTE-pushManagerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_pushManagerConfiguration=\ + REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pollManagerConfiguration=\ - REMOTE-pollManagerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_pollManagerConfiguration=\ + REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_managerConfiguration=\ - REMOTE-managerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_managerConfiguration=\ + REMOTE-CALL-FAILED-managerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_managerOperation=\ - REMOTE-managerOperation-FAILED-5001W|\ +REMOTE_CALL_FAILED_managerOperation=\ + REMOTE-CALL-FAILED-managerOperation-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateConfigurationFromPolicy=\ - REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\ + REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_runHealthTests=\ - REMOTE-runHealthTests-FAILED-5001W|\ +REMOTE_CALL_FAILED_runHealthTests=\ + REMOTE-CALL-FAILED-runHealthTests-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java index 674f680..b0a5f44 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * 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.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,30 +7,30 @@ import org.openecomp.logger.EcompMessageEnum; public enum ControllerServiceStandardeventcollectorServiceMessageEnum implements EcompMessageEnum { dummy, - deploy, - undeploy, - test, - suspend, - resume, - pushManagerConfiguration, - pollManagerConfiguration, - managerConfiguration, - managerOperation, - updateConfigurationFromPolicy, - runHealthTests, - REMOTE_deploy, - REMOTE_undeploy, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_pushManagerConfiguration, - REMOTE_pollManagerConfiguration, - REMOTE_managerConfiguration, - REMOTE_managerOperation, - REMOTE_updateConfigurationFromPolicy, - REMOTE_runHealthTests; + REQUEST_FAILED_deploy, + REQUEST_FAILED_undeploy, + REQUEST_FAILED_test, + REQUEST_FAILED_suspend, + REQUEST_FAILED_resume, + REQUEST_FAILED_pushManagerConfiguration, + REQUEST_FAILED_pollManagerConfiguration, + REQUEST_FAILED_managerConfiguration, + REQUEST_FAILED_managerOperation, + REQUEST_FAILED_updateConfigurationFromPolicy, + REQUEST_FAILED_runHealthTests, + REMOTE_CALL_FAILED_deploy, + REMOTE_CALL_FAILED_undeploy, + REMOTE_CALL_FAILED_test, + REMOTE_CALL_FAILED_suspend, + REMOTE_CALL_FAILED_resume, + REMOTE_CALL_FAILED_pushManagerConfiguration, + REMOTE_CALL_FAILED_pollManagerConfiguration, + REMOTE_CALL_FAILED_managerConfiguration, + REMOTE_CALL_FAILED_managerOperation, + REMOTE_CALL_FAILED_updateConfigurationFromPolicy, + REMOTE_CALL_FAILED_runHealthTests; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging.ControllerServiceStandardeventcollectorService"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService"); } } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java index 9ed3453..913d17d 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java @@ -1,51 +1,32 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * 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.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging; import org.openecomp.entity.EcompOperationEnum; public enum ControllerServiceStandardeventcollectorServiceOperationEnum implements EcompOperationEnum { - deploy, - undeploy, - test, - suspend, - resume, - pushManagerConfiguration, - pollManagerConfiguration, - managerConfiguration, - managerOperation, - updateConfigurationFromPolicy, - runHealthTests, - REMOTE_deploy, - REMOTE_undeploy, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_pushManagerConfiguration, - REMOTE_pollManagerConfiguration, - REMOTE_managerConfiguration, - REMOTE_managerOperation, - REMOTE_updateConfigurationFromPolicy, - REMOTE_runHealthTests; + ControllerServiceStandardeventcollectorService_deploy("ControllerServiceStandardeventcollectorService@deploy"), + ControllerServiceStandardeventcollectorService_undeploy("ControllerServiceStandardeventcollectorService@undeploy"), + ControllerServiceStandardeventcollectorService_test("ControllerServiceStandardeventcollectorService@test"), + ControllerServiceStandardeventcollectorService_suspend("ControllerServiceStandardeventcollectorService@suspend"), + ControllerServiceStandardeventcollectorService_resume("ControllerServiceStandardeventcollectorService@resume"), + ControllerServiceStandardeventcollectorService_pushManagerConfiguration("ControllerServiceStandardeventcollectorService@pushManagerConfiguration"), + ControllerServiceStandardeventcollectorService_pollManagerConfiguration("ControllerServiceStandardeventcollectorService@pollManagerConfiguration"), + ControllerServiceStandardeventcollectorService_managerConfiguration("ControllerServiceStandardeventcollectorService@managerConfiguration"), + ControllerServiceStandardeventcollectorService_managerOperation("ControllerServiceStandardeventcollectorService@managerOperation"), + ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy("ControllerServiceStandardeventcollectorService@updateConfigurationFromPolicy"), + ControllerServiceStandardeventcollectorService_runHealthTests("ControllerServiceStandardeventcollectorService@runHealthTests") ; + + + private String n; + + private ControllerServiceStandardeventcollectorServiceOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath index 69b19c6..fa22bb1 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath @@ -1,17 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/xcore"> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/classes" path="src/main/xcore-gen"> <attributes> <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="src" path="src/main/xcore-gen"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project index 95decc1..cf16113 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project @@ -25,8 +25,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..447ff97 --- /dev/null +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/xcore=UTF-8 +encoding//src/main/xcore-gen=UTF-8 +encoding/<project>=UTF-8 diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs index 4ede96d..13b3428 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,13 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF index befd3c9..bbb2695 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF @@ -16,17 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.standardeventcollector.man Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.xtext.xbase.lib, - org.eclipse.emf.ecore.xcore.lib, - dcae-controller-core-model;visibility:=reexport, - ncomp-core-model;bundle-version="0.1.0";visibility:=reexport, - ncomp-openstack-model;visibility:=reexport, - ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport, - ncomp-core-types;bundle-version="0.1.0", - ncomp-utils-java;bundle-version="0.1.0", - dcae-controller-service-docker-model;bundle-version="0.1.0";visibility:=reexport, - dcae-controller-service-standardeventcollector-model;visibility:=reexport, - ncomp-sirius-manager-agent-model;visibility:=reexport, - ncomp-docker-model;visibility:=reexport, - dcae-controller-service-docker-host-model;visibility:=reexport, - dcae-controller-service-vm-model;visibility:=reexport + org.eclipse.emf.ecore.xcore.lib Bundle-ActivationPolicy: lazy diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java index a926505..d6b2f00 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java @@ -40,6 +40,24 @@ import org.eclipse.emf.ecore.EPackage; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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============================================ + * <!-- end-model-doc --> * @see org.openecomp.dcae.controller.service.standardeventcollector.manager.ManagerFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.standardeventcollector'" @@ -143,31 +161,31 @@ public interface ManagerPackage extends EPackage { int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Keystorepwd</b></em>' attribute. + * The feature id for the '<em><b>Keystorealias</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 3; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute. + * The feature id for the '<em><b>Keystorepwdloc</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 4; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Authid</b></em>' attribute. + * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 5; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Authflag</b></em>' attribute. @@ -179,40 +197,40 @@ public interface ManagerPackage extends EPackage { int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Authpwd</b></em>' attribute. + * The feature id for the '<em><b>Authlist</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 7; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Authfile</b></em>' attribute. + * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 8; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 8; /** - * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute. + * The feature id for the '<em><b>Schemafile</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 9; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 9; /** - * The feature id for the '<em><b>Schemafile</b></em>' attribute. + * The feature id for the '<em><b>Streamid</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 10; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 10; /** * The number of structural features of the '<em>Controller Service Standardeventcollector Manager</em>' class. diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java index 24761cc..10c02e8 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java @@ -24,12 +24,11 @@ package org.openecomp.dcae.controller.service.standardeventcollector.manager.impl; import org.openecomp.dcae.controller.service.dockermanager.impl.DockerManagerImpl; - import org.openecomp.dcae.controller.service.standardeventcollector.manager.ControllerServiceStandardeventcollectorManager; import org.openecomp.dcae.controller.service.standardeventcollector.manager.ManagerPackage; - import org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration; import org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; @@ -40,20 +39,20 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getCport <em>Cport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getCsecport <em>Csecport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystoreloc <em>Keystoreloc</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystorepwd <em>Keystorepwd</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystorealias <em>Keystorealias</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystorepwdloc <em>Keystorepwdloc</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getMaxinputqueue <em>Maxinputqueue</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthid <em>Authid</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthflag <em>Authflag</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthpwd <em>Authpwd</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthfile <em>Authfile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthlist <em>Authlist</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getCheckschemaflag <em>Checkschemaflag</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getSchemafile <em>Schemafile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getStreamid <em>Streamid</em>}</li> * </ul> - * </p> * * @generated */ @@ -113,59 +112,59 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa */ protected String keystoreloc = KEYSTORELOC_EDEFAULT; /** - * The default value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute. + * The default value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getKeystorepwd() + * @see #getKeystorealias() * @generated * @ordered */ - protected static final String KEYSTOREPWD_EDEFAULT = null; + protected static final String KEYSTOREALIAS_EDEFAULT = null; /** - * The cached value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute. + * The cached value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getKeystorepwd() + * @see #getKeystorealias() * @generated * @ordered */ - protected String keystorepwd = KEYSTOREPWD_EDEFAULT; + protected String keystorealias = KEYSTOREALIAS_EDEFAULT; /** - * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. + * The default value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMaxinputqueue() + * @see #getKeystorepwdloc() * @generated * @ordered */ - protected static final String MAXINPUTQUEUE_EDEFAULT = null; + protected static final String KEYSTOREPWDLOC_EDEFAULT = null; /** - * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. + * The cached value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMaxinputqueue() + * @see #getKeystorepwdloc() * @generated * @ordered */ - protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT; + protected String keystorepwdloc = KEYSTOREPWDLOC_EDEFAULT; /** - * The default value of the '{@link #getAuthid() <em>Authid</em>}' attribute. + * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthid() + * @see #getMaxinputqueue() * @generated * @ordered */ - protected static final String AUTHID_EDEFAULT = null; + protected static final String MAXINPUTQUEUE_EDEFAULT = null; /** - * The cached value of the '{@link #getAuthid() <em>Authid</em>}' attribute. + * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthid() + * @see #getMaxinputqueue() * @generated * @ordered */ - protected String authid = AUTHID_EDEFAULT; + protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT; /** * The default value of the '{@link #getAuthflag() <em>Authflag</em>}' attribute. * <!-- begin-user-doc --> @@ -185,41 +184,23 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa */ protected String authflag = AUTHFLAG_EDEFAULT; /** - * The default value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAuthpwd() - * @generated - * @ordered - */ - protected static final String AUTHPWD_EDEFAULT = null; - /** - * The cached value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAuthpwd() - * @generated - * @ordered - */ - protected String authpwd = AUTHPWD_EDEFAULT; - /** - * The default value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute. + * The default value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthfile() + * @see #getAuthlist() * @generated * @ordered */ - protected static final String AUTHFILE_EDEFAULT = null; + protected static final String AUTHLIST_EDEFAULT = null; /** - * The cached value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute. + * The cached value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthfile() + * @see #getAuthlist() * @generated * @ordered */ - protected String authfile = AUTHFILE_EDEFAULT; + protected String authlist = AUTHLIST_EDEFAULT; /** * The default value of the '{@link #getCheckschemaflag() <em>Checkschemaflag</em>}' attribute. * <!-- begin-user-doc --> @@ -257,6 +238,24 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa */ protected String schemafile = SCHEMAFILE_EDEFAULT; /** + * The default value of the '{@link #getStreamid() <em>Streamid</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStreamid() + * @generated + * @ordered + */ + protected static final String STREAMID_EDEFAULT = null; + /** + * The cached value of the '{@link #getStreamid() <em>Streamid</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStreamid() + * @generated + * @ordered + */ + protected String streamid = STREAMID_EDEFAULT; + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -343,8 +342,8 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa * <!-- end-user-doc --> * @generated */ - public String getKeystorepwd() { - return keystorepwd; + public String getKeystorealias() { + return keystorealias; } /** @@ -352,11 +351,11 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa * <!-- end-user-doc --> * @generated */ - public void setKeystorepwd(String newKeystorepwd) { - String oldKeystorepwd = keystorepwd; - keystorepwd = newKeystorepwd; + public void setKeystorealias(String newKeystorealias) { + String oldKeystorealias = keystorealias; + keystorealias = newKeystorealias; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD, oldKeystorepwd, keystorepwd)); + eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS, oldKeystorealias, keystorealias)); } /** @@ -364,8 +363,8 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa * <!-- end-user-doc --> * @generated */ - public String getMaxinputqueue() { - return maxinputqueue; + public String getKeystorepwdloc() { + return keystorepwdloc; } /** @@ -373,11 +372,11 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa * <!-- end-user-doc --> * @generated */ - public void setMaxinputqueue(String newMaxinputqueue) { - String oldMaxinputqueue = maxinputqueue; - maxinputqueue = newMaxinputqueue; + public void setKeystorepwdloc(String newKeystorepwdloc) { + String oldKeystorepwdloc = keystorepwdloc; + keystorepwdloc = newKeystorepwdloc; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue)); + eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC, oldKeystorepwdloc, keystorepwdloc)); } /** @@ -385,8 +384,8 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa * <!-- end-user-doc --> * @generated */ - public String getAuthid() { - return authid; + public String getMaxinputqueue() { + return maxinputqueue; } /** @@ -394,11 +393,11 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa * <!-- end-user-doc --> * @generated */ - public void setAuthid(String newAuthid) { - String oldAuthid = authid; - authid = newAuthid; + public void setMaxinputqueue(String newMaxinputqueue) { + String oldMaxinputqueue = maxinputqueue; + maxinputqueue = newMaxinputqueue; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID, oldAuthid, authid)); + eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue)); } /** @@ -427,48 +426,6 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa * <!-- end-user-doc --> * @generated */ - public String getAuthpwd() { - return authpwd; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setAuthpwd(String newAuthpwd) { - String oldAuthpwd = authpwd; - authpwd = newAuthpwd; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD, oldAuthpwd, authpwd)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getAuthfile() { - return authfile; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setAuthfile(String newAuthfile) { - String oldAuthfile = authfile; - authfile = newAuthfile; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE, oldAuthfile, authfile)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public String getCheckschemaflag() { return checkschemaflag; } @@ -520,22 +477,22 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa return getCsecport(); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC: return getKeystoreloc(); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD: - return getKeystorepwd(); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS: + return getKeystorealias(); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC: + return getKeystorepwdloc(); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE: return getMaxinputqueue(); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID: - return getAuthid(); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG: return getAuthflag(); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD: - return getAuthpwd(); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE: - return getAuthfile(); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST: + return getAuthlist(); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG: return getCheckschemaflag(); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE: return getSchemafile(); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID: + return getStreamid(); } return super.eGet(featureID, resolve, coreType); } @@ -557,23 +514,20 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC: setKeystoreloc((String)newValue); return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD: - setKeystorepwd((String)newValue); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS: + setKeystorealias((String)newValue); + return; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC: + setKeystorepwdloc((String)newValue); return; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE: setMaxinputqueue((String)newValue); return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID: - setAuthid((String)newValue); - return; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG: setAuthflag((String)newValue); return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD: - setAuthpwd((String)newValue); - return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE: - setAuthfile((String)newValue); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST: + setAuthlist((String)newValue); return; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG: setCheckschemaflag((String)newValue); @@ -581,6 +535,9 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE: setSchemafile((String)newValue); return; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID: + setStreamid((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -602,23 +559,20 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC: setKeystoreloc(KEYSTORELOC_EDEFAULT); return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD: - setKeystorepwd(KEYSTOREPWD_EDEFAULT); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS: + setKeystorealias(KEYSTOREALIAS_EDEFAULT); + return; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC: + setKeystorepwdloc(KEYSTOREPWDLOC_EDEFAULT); return; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE: setMaxinputqueue(MAXINPUTQUEUE_EDEFAULT); return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID: - setAuthid(AUTHID_EDEFAULT); - return; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG: setAuthflag(AUTHFLAG_EDEFAULT); return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD: - setAuthpwd(AUTHPWD_EDEFAULT); - return; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE: - setAuthfile(AUTHFILE_EDEFAULT); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST: + setAuthlist(AUTHLIST_EDEFAULT); return; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG: setCheckschemaflag(CHECKSCHEMAFLAG_EDEFAULT); @@ -626,6 +580,9 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE: setSchemafile(SCHEMAFILE_EDEFAULT); return; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID: + setStreamid(STREAMID_EDEFAULT); + return; } super.eUnset(featureID); } @@ -644,22 +601,22 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa return CSECPORT_EDEFAULT == null ? csecport != null : !CSECPORT_EDEFAULT.equals(csecport); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC: return KEYSTORELOC_EDEFAULT == null ? keystoreloc != null : !KEYSTORELOC_EDEFAULT.equals(keystoreloc); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD: - return KEYSTOREPWD_EDEFAULT == null ? keystorepwd != null : !KEYSTOREPWD_EDEFAULT.equals(keystorepwd); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS: + return KEYSTOREALIAS_EDEFAULT == null ? keystorealias != null : !KEYSTOREALIAS_EDEFAULT.equals(keystorealias); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC: + return KEYSTOREPWDLOC_EDEFAULT == null ? keystorepwdloc != null : !KEYSTOREPWDLOC_EDEFAULT.equals(keystorepwdloc); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE: return MAXINPUTQUEUE_EDEFAULT == null ? maxinputqueue != null : !MAXINPUTQUEUE_EDEFAULT.equals(maxinputqueue); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID: - return AUTHID_EDEFAULT == null ? authid != null : !AUTHID_EDEFAULT.equals(authid); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG: return AUTHFLAG_EDEFAULT == null ? authflag != null : !AUTHFLAG_EDEFAULT.equals(authflag); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD: - return AUTHPWD_EDEFAULT == null ? authpwd != null : !AUTHPWD_EDEFAULT.equals(authpwd); - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE: - return AUTHFILE_EDEFAULT == null ? authfile != null : !AUTHFILE_EDEFAULT.equals(authfile); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST: + return AUTHLIST_EDEFAULT == null ? authlist != null : !AUTHLIST_EDEFAULT.equals(authlist); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG: return CHECKSCHEMAFLAG_EDEFAULT == null ? checkschemaflag != null : !CHECKSCHEMAFLAG_EDEFAULT.equals(checkschemaflag); case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE: return SCHEMAFILE_EDEFAULT == null ? schemafile != null : !SCHEMAFILE_EDEFAULT.equals(schemafile); + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID: + return STREAMID_EDEFAULT == null ? streamid != null : !STREAMID_EDEFAULT.equals(streamid); } return super.eIsSet(featureID); } @@ -676,14 +633,14 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CSECPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD; - case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG; case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE; + case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID; default: return -1; } } @@ -702,14 +659,14 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CPORT; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CSECPORT; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID; default: return -1; } } @@ -732,24 +689,57 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa result.append(csecport); result.append(", keystoreloc: "); result.append(keystoreloc); - result.append(", keystorepwd: "); - result.append(keystorepwd); + result.append(", keystorealias: "); + result.append(keystorealias); + result.append(", keystorepwdloc: "); + result.append(keystorepwdloc); result.append(", maxinputqueue: "); result.append(maxinputqueue); - result.append(", authid: "); - result.append(authid); result.append(", authflag: "); result.append(authflag); - result.append(", authpwd: "); - result.append(authpwd); - result.append(", authfile: "); - result.append(authfile); + result.append(", authlist: "); + result.append(authlist); result.append(", checkschemaflag: "); result.append(checkschemaflag); result.append(", schemafile: "); result.append(schemafile); + result.append(", streamid: "); + result.append(streamid); result.append(')'); return result.toString(); } + @Override + public String getAuthlist() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setAuthlist(String value) { + // TODO Auto-generated method stub + + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getStreamid() { + return streamid; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setStreamid(String newStreamid) { + String oldStreamid = streamid; + streamid = newStreamid; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID, oldStreamid, streamid)); + } + } //ControllerServiceStandardeventcollectorManagerImpl diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java index 4936e09..2e5ad28 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java @@ -23,8 +23,6 @@ */ package org.openecomp.dcae.controller.service.standardeventcollector.manager.util; -import org.openecomp.dcae.controller.core.manager.DcaeManager; - import org.openecomp.dcae.controller.service.dockermanager.DockerManager; import org.openecomp.dcae.controller.service.standardeventcollector.manager.*; @@ -37,6 +35,7 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; +import org.openecomp.dcae.controller.core.manager.DcaeManager; /** * <!-- begin-user-doc --> diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java index 4833d85..79b00be 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java @@ -23,8 +23,6 @@ */ package org.openecomp.dcae.controller.service.standardeventcollector.manager.util; -import org.openecomp.dcae.controller.core.manager.DcaeManager; - import org.openecomp.dcae.controller.service.dockermanager.DockerManager; import org.openecomp.dcae.controller.service.standardeventcollector.manager.*; @@ -35,6 +33,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; +import org.openecomp.dcae.controller.core.manager.DcaeManager; /** * <!-- begin-user-doc --> @@ -74,7 +73,7 @@ public class ManagerSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java index d7866bf..c664ea6 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java @@ -32,20 +32,20 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCport <em>Cport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCsecport <em>Csecport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystoreloc <em>Keystoreloc</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd <em>Keystorepwd</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias <em>Keystorealias</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc <em>Keystorepwdloc</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid <em>Authid</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthflag <em>Authflag</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd <em>Authpwd</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile <em>Authfile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist <em>Authlist</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid <em>Streamid</em>}</li> * </ul> - * </p> * * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration() * @model @@ -135,85 +135,85 @@ public interface ControllerServiceStandardeventcollectorServiceConfiguration ext void setKeystoreloc(String value); /** - * Returns the value of the '<em><b>Keystorepwd</b></em>' attribute. + * Returns the value of the '<em><b>Keystorealias</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Keystorepwd</em>' attribute isn't clear, + * If the meaning of the '<em>Keystorealias</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Keystorepwd</em>' attribute. - * @see #setKeystorepwd(String) - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd() + * @return the value of the '<em>Keystorealias</em>' attribute. + * @see #setKeystorealias(String) + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias() * @model unique="false" * annotation="http://openecomp.org type='configuration'" * @generated */ - String getKeystorepwd(); + String getKeystorealias(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd <em>Keystorepwd</em>}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias <em>Keystorealias</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Keystorepwd</em>' attribute. - * @see #getKeystorepwd() + * @param value the new value of the '<em>Keystorealias</em>' attribute. + * @see #getKeystorealias() * @generated */ - void setKeystorepwd(String value); + void setKeystorealias(String value); /** - * Returns the value of the '<em><b>Maxinputqueue</b></em>' attribute. + * Returns the value of the '<em><b>Keystorepwdloc</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Maxinputqueue</em>' attribute isn't clear, + * If the meaning of the '<em>Keystorepwdloc</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Maxinputqueue</em>' attribute. - * @see #setMaxinputqueue(String) - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue() + * @return the value of the '<em>Keystorepwdloc</em>' attribute. + * @see #setKeystorepwdloc(String) + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc() * @model unique="false" * annotation="http://openecomp.org type='configuration'" * @generated */ - String getMaxinputqueue(); + String getKeystorepwdloc(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc <em>Keystorepwdloc</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Maxinputqueue</em>' attribute. - * @see #getMaxinputqueue() + * @param value the new value of the '<em>Keystorepwdloc</em>' attribute. + * @see #getKeystorepwdloc() * @generated */ - void setMaxinputqueue(String value); + void setKeystorepwdloc(String value); /** - * Returns the value of the '<em><b>Authid</b></em>' attribute. + * Returns the value of the '<em><b>Maxinputqueue</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Authid</em>' attribute isn't clear, + * If the meaning of the '<em>Maxinputqueue</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Authid</em>' attribute. - * @see #setAuthid(String) - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authid() + * @return the value of the '<em>Maxinputqueue</em>' attribute. + * @see #setMaxinputqueue(String) + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue() * @model unique="false" * annotation="http://openecomp.org type='configuration'" * @generated */ - String getAuthid(); + String getMaxinputqueue(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid <em>Authid</em>}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Authid</em>' attribute. - * @see #getAuthid() + * @param value the new value of the '<em>Maxinputqueue</em>' attribute. + * @see #getMaxinputqueue() * @generated */ - void setAuthid(String value); + void setMaxinputqueue(String value); /** * Returns the value of the '<em><b>Authflag</b></em>' attribute. @@ -243,110 +243,110 @@ public interface ControllerServiceStandardeventcollectorServiceConfiguration ext void setAuthflag(String value); /** - * Returns the value of the '<em><b>Authpwd</b></em>' attribute. + * Returns the value of the '<em><b>Checkschemaflag</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Authpwd</em>' attribute isn't clear, + * If the meaning of the '<em>Checkschemaflag</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Authpwd</em>' attribute. - * @see #setAuthpwd(String) - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd() + * @return the value of the '<em>Checkschemaflag</em>' attribute. + * @see #setCheckschemaflag(String) + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag() * @model unique="false" * annotation="http://openecomp.org type='configuration'" * @generated */ - String getAuthpwd(); + String getCheckschemaflag(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd <em>Authpwd</em>}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Authpwd</em>' attribute. - * @see #getAuthpwd() + * @param value the new value of the '<em>Checkschemaflag</em>' attribute. + * @see #getCheckschemaflag() * @generated */ - void setAuthpwd(String value); + void setCheckschemaflag(String value); /** - * Returns the value of the '<em><b>Authfile</b></em>' attribute. + * Returns the value of the '<em><b>Schemafile</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Authfile</em>' attribute isn't clear, + * If the meaning of the '<em>Schemafile</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Authfile</em>' attribute. - * @see #setAuthfile(String) - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authfile() + * @return the value of the '<em>Schemafile</em>' attribute. + * @see #setSchemafile(String) + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile() * @model unique="false" * annotation="http://openecomp.org type='configuration'" * @generated */ - String getAuthfile(); + String getSchemafile(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile <em>Authfile</em>}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Authfile</em>' attribute. - * @see #getAuthfile() + * @param value the new value of the '<em>Schemafile</em>' attribute. + * @see #getSchemafile() * @generated */ - void setAuthfile(String value); + void setSchemafile(String value); /** - * Returns the value of the '<em><b>Checkschemaflag</b></em>' attribute. + * Returns the value of the '<em><b>Authlist</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Checkschemaflag</em>' attribute isn't clear, + * If the meaning of the '<em>Authlist</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Checkschemaflag</em>' attribute. - * @see #setCheckschemaflag(String) - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag() + * @return the value of the '<em>Authlist</em>' attribute. + * @see #setAuthlist(String) + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authlist() * @model unique="false" * annotation="http://openecomp.org type='configuration'" * @generated */ - String getCheckschemaflag(); + String getAuthlist(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist <em>Authlist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Checkschemaflag</em>' attribute. - * @see #getCheckschemaflag() + * @param value the new value of the '<em>Authlist</em>' attribute. + * @see #getAuthlist() * @generated */ - void setCheckschemaflag(String value); + void setAuthlist(String value); /** - * Returns the value of the '<em><b>Schemafile</b></em>' attribute. + * Returns the value of the '<em><b>Streamid</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Schemafile</em>' attribute isn't clear, + * If the meaning of the '<em>Streamid</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Schemafile</em>' attribute. - * @see #setSchemafile(String) - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile() + * @return the value of the '<em>Streamid</em>' attribute. + * @see #setStreamid(String) + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Streamid() * @model unique="false" * annotation="http://openecomp.org type='configuration'" * @generated */ - String getSchemafile(); + String getStreamid(); /** - * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}' attribute. + * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid <em>Streamid</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Schemafile</em>' attribute. - * @see #getSchemafile() + * @param value the new value of the '<em>Streamid</em>' attribute. + * @see #getStreamid() * @generated */ - void setSchemafile(String value); + void setStreamid(String value); } // ControllerServiceStandardeventcollectorServiceConfiguration diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java index c69f5c3..f5bf0fa 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java @@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EPackage; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * 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============================================ + * <!-- end-model-doc --> * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServiceFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.standardeventcollector'" @@ -479,31 +497,31 @@ public interface ServicePackage extends EPackage { int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Keystorepwd</b></em>' attribute. + * The feature id for the '<em><b>Keystorealias</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 3; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute. + * The feature id for the '<em><b>Keystorepwdloc</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 4; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 4; /** - * The feature id for the '<em><b>Authid</b></em>' attribute. + * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 5; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 5; /** * The feature id for the '<em><b>Authflag</b></em>' attribute. @@ -515,40 +533,40 @@ public interface ServicePackage extends EPackage { int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 6; /** - * The feature id for the '<em><b>Authpwd</b></em>' attribute. + * The feature id for the '<em><b>Authlist</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 7; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 7; /** - * The feature id for the '<em><b>Authfile</b></em>' attribute. + * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 8; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 8; /** - * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute. + * The feature id for the '<em><b>Schemafile</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 9; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 9; /** - * The feature id for the '<em><b>Schemafile</b></em>' attribute. + * The feature id for the '<em><b>Streamid</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 10; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 10; /** * The number of structural features of the '<em>Controller Service Standardeventcollector Service Instance</em>' class. @@ -606,31 +624,31 @@ public interface ServicePackage extends EPackage { int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC = 2; /** - * The feature id for the '<em><b>Keystorepwd</b></em>' attribute. + * The feature id for the '<em><b>Keystorealias</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD = 3; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS = 3; /** - * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute. + * The feature id for the '<em><b>Keystorepwdloc</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = 4; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC = 4; /** - * The feature id for the '<em><b>Authid</b></em>' attribute. + * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID = 5; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = 5; /** * The feature id for the '<em><b>Authflag</b></em>' attribute. @@ -642,40 +660,40 @@ public interface ServicePackage extends EPackage { int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG = 6; /** - * The feature id for the '<em><b>Authpwd</b></em>' attribute. + * The feature id for the '<em><b>Authlist</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD = 7; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST = 7; /** - * The feature id for the '<em><b>Authfile</b></em>' attribute. + * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE = 8; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = 8; /** - * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute. + * The feature id for the '<em><b>Schemafile</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = 9; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = 9; /** - * The feature id for the '<em><b>Schemafile</b></em>' attribute. + * The feature id for the '<em><b>Streamid</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = 10; + int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID = 10; /** * The number of structural features of the '<em>Controller Service Standardeventcollector Service Configuration</em>' class. @@ -760,37 +778,37 @@ public interface ServicePackage extends EPackage { EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystoreloc(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd <em>Keystorepwd</em>}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias <em>Keystorealias</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Keystorepwd</em>'. - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd() + * @return the meta object for the attribute '<em>Keystorealias</em>'. + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias() * @see #getControllerServiceStandardeventcollectorServiceConfiguration() * @generated */ - EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd(); + EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc <em>Keystorepwdloc</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Maxinputqueue</em>'. - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue() + * @return the meta object for the attribute '<em>Keystorepwdloc</em>'. + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc() * @see #getControllerServiceStandardeventcollectorServiceConfiguration() * @generated */ - EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(); + EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid <em>Authid</em>}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Authid</em>'. - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid() + * @return the meta object for the attribute '<em>Maxinputqueue</em>'. + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue() * @see #getControllerServiceStandardeventcollectorServiceConfiguration() * @generated */ - EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authid(); + EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(); /** * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthflag <em>Authflag</em>}'. @@ -804,48 +822,48 @@ public interface ServicePackage extends EPackage { EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authflag(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd <em>Authpwd</em>}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Authpwd</em>'. - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd() + * @return the meta object for the attribute '<em>Checkschemaflag</em>'. + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag() * @see #getControllerServiceStandardeventcollectorServiceConfiguration() * @generated */ - EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd(); + EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile <em>Authfile</em>}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Authfile</em>'. - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile() + * @return the meta object for the attribute '<em>Schemafile</em>'. + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile() * @see #getControllerServiceStandardeventcollectorServiceConfiguration() * @generated */ - EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authfile(); + EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist <em>Authlist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Checkschemaflag</em>'. - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag() + * @return the meta object for the attribute '<em>Authlist</em>'. + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist() * @see #getControllerServiceStandardeventcollectorServiceConfiguration() * @generated */ - EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(); + EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authlist(); /** - * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}'. + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid <em>Streamid</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Schemafile</em>'. - * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile() + * @return the meta object for the attribute '<em>Streamid</em>'. + * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid() * @see #getControllerServiceStandardeventcollectorServiceConfiguration() * @generated */ - EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(); + EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Streamid(); /** * Returns the factory that creates the instances of the model. @@ -925,28 +943,28 @@ public interface ServicePackage extends EPackage { EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystoreloc(); /** - * The meta object literal for the '<em><b>Keystorepwd</b></em>' attribute feature. + * The meta object literal for the '<em><b>Keystorealias</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd(); + EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias(); /** - * The meta object literal for the '<em><b>Maxinputqueue</b></em>' attribute feature. + * The meta object literal for the '<em><b>Keystorepwdloc</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(); + EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc(); /** - * The meta object literal for the '<em><b>Authid</b></em>' attribute feature. + * The meta object literal for the '<em><b>Maxinputqueue</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authid(); + EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(); /** * The meta object literal for the '<em><b>Authflag</b></em>' attribute feature. @@ -957,36 +975,36 @@ public interface ServicePackage extends EPackage { EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authflag(); /** - * The meta object literal for the '<em><b>Authpwd</b></em>' attribute feature. + * The meta object literal for the '<em><b>Checkschemaflag</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd(); + EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(); /** - * The meta object literal for the '<em><b>Authfile</b></em>' attribute feature. + * The meta object literal for the '<em><b>Schemafile</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authfile(); + EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(); /** - * The meta object literal for the '<em><b>Checkschemaflag</b></em>' attribute feature. + * The meta object literal for the '<em><b>Authlist</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(); + EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authlist(); /** - * The meta object literal for the '<em><b>Schemafile</b></em>' attribute feature. + * The meta object literal for the '<em><b>Streamid</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(); + EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Streamid(); } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java index ce333f2..acecfe3 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java @@ -38,20 +38,20 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getCport <em>Cport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getCsecport <em>Csecport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystoreloc <em>Keystoreloc</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystorepwd <em>Keystorepwd</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystorealias <em>Keystorealias</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystorepwdloc <em>Keystorepwdloc</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getMaxinputqueue <em>Maxinputqueue</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthid <em>Authid</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthflag <em>Authflag</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthpwd <em>Authpwd</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthfile <em>Authfile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthlist <em>Authlist</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getCheckschemaflag <em>Checkschemaflag</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getSchemafile <em>Schemafile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getStreamid <em>Streamid</em>}</li> * </ul> - * </p> * * @generated */ @@ -111,59 +111,59 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext */ protected String keystoreloc = KEYSTORELOC_EDEFAULT; /** - * The default value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute. + * The default value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getKeystorepwd() + * @see #getKeystorealias() * @generated * @ordered */ - protected static final String KEYSTOREPWD_EDEFAULT = null; + protected static final String KEYSTOREALIAS_EDEFAULT = null; /** - * The cached value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute. + * The cached value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getKeystorepwd() + * @see #getKeystorealias() * @generated * @ordered */ - protected String keystorepwd = KEYSTOREPWD_EDEFAULT; + protected String keystorealias = KEYSTOREALIAS_EDEFAULT; /** - * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. + * The default value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMaxinputqueue() + * @see #getKeystorepwdloc() * @generated * @ordered */ - protected static final String MAXINPUTQUEUE_EDEFAULT = null; + protected static final String KEYSTOREPWDLOC_EDEFAULT = null; /** - * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. + * The cached value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMaxinputqueue() + * @see #getKeystorepwdloc() * @generated * @ordered */ - protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT; + protected String keystorepwdloc = KEYSTOREPWDLOC_EDEFAULT; /** - * The default value of the '{@link #getAuthid() <em>Authid</em>}' attribute. + * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthid() + * @see #getMaxinputqueue() * @generated * @ordered */ - protected static final String AUTHID_EDEFAULT = null; + protected static final String MAXINPUTQUEUE_EDEFAULT = null; /** - * The cached value of the '{@link #getAuthid() <em>Authid</em>}' attribute. + * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthid() + * @see #getMaxinputqueue() * @generated * @ordered */ - protected String authid = AUTHID_EDEFAULT; + protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT; /** * The default value of the '{@link #getAuthflag() <em>Authflag</em>}' attribute. * <!-- begin-user-doc --> @@ -183,41 +183,23 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext */ protected String authflag = AUTHFLAG_EDEFAULT; /** - * The default value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAuthpwd() - * @generated - * @ordered - */ - protected static final String AUTHPWD_EDEFAULT = null; - /** - * The cached value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute. + * The default value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthpwd() + * @see #getAuthlist() * @generated * @ordered */ - protected String authpwd = AUTHPWD_EDEFAULT; + protected static final String AUTHLIST_EDEFAULT = null; /** - * The default value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute. + * The cached value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthfile() + * @see #getAuthlist() * @generated * @ordered */ - protected static final String AUTHFILE_EDEFAULT = null; - /** - * The cached value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAuthfile() - * @generated - * @ordered - */ - protected String authfile = AUTHFILE_EDEFAULT; + protected String authlist = AUTHLIST_EDEFAULT; /** * The default value of the '{@link #getCheckschemaflag() <em>Checkschemaflag</em>}' attribute. * <!-- begin-user-doc --> @@ -255,6 +237,24 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext */ protected String schemafile = SCHEMAFILE_EDEFAULT; /** + * The default value of the '{@link #getStreamid() <em>Streamid</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStreamid() + * @generated + * @ordered + */ + protected static final String STREAMID_EDEFAULT = null; + /** + * The cached value of the '{@link #getStreamid() <em>Streamid</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStreamid() + * @generated + * @ordered + */ + protected String streamid = STREAMID_EDEFAULT; + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -341,8 +341,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public String getKeystorepwd() { - return keystorepwd; + public String getKeystorealias() { + return keystorealias; } /** @@ -350,11 +350,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public void setKeystorepwd(String newKeystorepwd) { - String oldKeystorepwd = keystorepwd; - keystorepwd = newKeystorepwd; + public void setKeystorealias(String newKeystorealias) { + String oldKeystorealias = keystorealias; + keystorealias = newKeystorealias; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD, oldKeystorepwd, keystorepwd)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS, oldKeystorealias, keystorealias)); } /** @@ -362,8 +362,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public String getMaxinputqueue() { - return maxinputqueue; + public String getKeystorepwdloc() { + return keystorepwdloc; } /** @@ -371,11 +371,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public void setMaxinputqueue(String newMaxinputqueue) { - String oldMaxinputqueue = maxinputqueue; - maxinputqueue = newMaxinputqueue; + public void setKeystorepwdloc(String newKeystorepwdloc) { + String oldKeystorepwdloc = keystorepwdloc; + keystorepwdloc = newKeystorepwdloc; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC, oldKeystorepwdloc, keystorepwdloc)); } /** @@ -383,8 +383,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public String getAuthid() { - return authid; + public String getMaxinputqueue() { + return maxinputqueue; } /** @@ -392,11 +392,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public void setAuthid(String newAuthid) { - String oldAuthid = authid; - authid = newAuthid; + public void setMaxinputqueue(String newMaxinputqueue) { + String oldMaxinputqueue = maxinputqueue; + maxinputqueue = newMaxinputqueue; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID, oldAuthid, authid)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue)); } /** @@ -425,8 +425,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public String getAuthpwd() { - return authpwd; + public String getCheckschemaflag() { + return checkschemaflag; } /** @@ -434,11 +434,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public void setAuthpwd(String newAuthpwd) { - String oldAuthpwd = authpwd; - authpwd = newAuthpwd; + public void setCheckschemaflag(String newCheckschemaflag) { + String oldCheckschemaflag = checkschemaflag; + checkschemaflag = newCheckschemaflag; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD, oldAuthpwd, authpwd)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag)); } /** @@ -446,8 +446,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public String getAuthfile() { - return authfile; + public String getSchemafile() { + return schemafile; } /** @@ -455,11 +455,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public void setAuthfile(String newAuthfile) { - String oldAuthfile = authfile; - authfile = newAuthfile; + public void setSchemafile(String newSchemafile) { + String oldSchemafile = schemafile; + schemafile = newSchemafile; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE, oldAuthfile, authfile)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE, oldSchemafile, schemafile)); } /** @@ -467,8 +467,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public String getCheckschemaflag() { - return checkschemaflag; + public String getAuthlist() { + return authlist; } /** @@ -476,11 +476,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public void setCheckschemaflag(String newCheckschemaflag) { - String oldCheckschemaflag = checkschemaflag; - checkschemaflag = newCheckschemaflag; + public void setAuthlist(String newAuthlist) { + String oldAuthlist = authlist; + authlist = newAuthlist; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST, oldAuthlist, authlist)); } /** @@ -488,8 +488,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public String getSchemafile() { - return schemafile; + public String getStreamid() { + return streamid; } /** @@ -497,11 +497,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext * <!-- end-user-doc --> * @generated */ - public void setSchemafile(String newSchemafile) { - String oldSchemafile = schemafile; - schemafile = newSchemafile; + public void setStreamid(String newStreamid) { + String oldStreamid = streamid; + streamid = newStreamid; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE, oldSchemafile, schemafile)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID, oldStreamid, streamid)); } /** @@ -518,22 +518,22 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext return getCsecport(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: return getKeystoreloc(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: - return getKeystorepwd(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: + return getKeystorealias(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: + return getKeystorepwdloc(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: return getMaxinputqueue(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: - return getAuthid(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: return getAuthflag(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: - return getAuthpwd(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: - return getAuthfile(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: + return getAuthlist(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: return getCheckschemaflag(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: return getSchemafile(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: + return getStreamid(); } return super.eGet(featureID, resolve, coreType); } @@ -555,23 +555,20 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: setKeystoreloc((String)newValue); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: - setKeystorepwd((String)newValue); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: + setKeystorealias((String)newValue); + return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: + setKeystorepwdloc((String)newValue); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: setMaxinputqueue((String)newValue); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: - setAuthid((String)newValue); - return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: setAuthflag((String)newValue); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: - setAuthpwd((String)newValue); - return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: - setAuthfile((String)newValue); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: + setAuthlist((String)newValue); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: setCheckschemaflag((String)newValue); @@ -579,6 +576,9 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: setSchemafile((String)newValue); return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: + setStreamid((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -600,23 +600,20 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: setKeystoreloc(KEYSTORELOC_EDEFAULT); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: - setKeystorepwd(KEYSTOREPWD_EDEFAULT); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: + setKeystorealias(KEYSTOREALIAS_EDEFAULT); + return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: + setKeystorepwdloc(KEYSTOREPWDLOC_EDEFAULT); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: setMaxinputqueue(MAXINPUTQUEUE_EDEFAULT); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: - setAuthid(AUTHID_EDEFAULT); - return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: setAuthflag(AUTHFLAG_EDEFAULT); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: - setAuthpwd(AUTHPWD_EDEFAULT); - return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: - setAuthfile(AUTHFILE_EDEFAULT); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: + setAuthlist(AUTHLIST_EDEFAULT); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: setCheckschemaflag(CHECKSCHEMAFLAG_EDEFAULT); @@ -624,6 +621,9 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: setSchemafile(SCHEMAFILE_EDEFAULT); return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: + setStreamid(STREAMID_EDEFAULT); + return; } super.eUnset(featureID); } @@ -642,22 +642,22 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext return CSECPORT_EDEFAULT == null ? csecport != null : !CSECPORT_EDEFAULT.equals(csecport); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: return KEYSTORELOC_EDEFAULT == null ? keystoreloc != null : !KEYSTORELOC_EDEFAULT.equals(keystoreloc); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: - return KEYSTOREPWD_EDEFAULT == null ? keystorepwd != null : !KEYSTOREPWD_EDEFAULT.equals(keystorepwd); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: + return KEYSTOREALIAS_EDEFAULT == null ? keystorealias != null : !KEYSTOREALIAS_EDEFAULT.equals(keystorealias); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: + return KEYSTOREPWDLOC_EDEFAULT == null ? keystorepwdloc != null : !KEYSTOREPWDLOC_EDEFAULT.equals(keystorepwdloc); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: return MAXINPUTQUEUE_EDEFAULT == null ? maxinputqueue != null : !MAXINPUTQUEUE_EDEFAULT.equals(maxinputqueue); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: - return AUTHID_EDEFAULT == null ? authid != null : !AUTHID_EDEFAULT.equals(authid); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: return AUTHFLAG_EDEFAULT == null ? authflag != null : !AUTHFLAG_EDEFAULT.equals(authflag); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: - return AUTHPWD_EDEFAULT == null ? authpwd != null : !AUTHPWD_EDEFAULT.equals(authpwd); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: - return AUTHFILE_EDEFAULT == null ? authfile != null : !AUTHFILE_EDEFAULT.equals(authfile); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: + return AUTHLIST_EDEFAULT == null ? authlist != null : !AUTHLIST_EDEFAULT.equals(authlist); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: return CHECKSCHEMAFLAG_EDEFAULT == null ? checkschemaflag != null : !CHECKSCHEMAFLAG_EDEFAULT.equals(checkschemaflag); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: return SCHEMAFILE_EDEFAULT == null ? schemafile != null : !SCHEMAFILE_EDEFAULT.equals(schemafile); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: + return STREAMID_EDEFAULT == null ? streamid != null : !STREAMID_EDEFAULT.equals(streamid); } return super.eIsSet(featureID); } @@ -678,22 +678,22 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext result.append(csecport); result.append(", keystoreloc: "); result.append(keystoreloc); - result.append(", keystorepwd: "); - result.append(keystorepwd); + result.append(", keystorealias: "); + result.append(keystorealias); + result.append(", keystorepwdloc: "); + result.append(keystorepwdloc); result.append(", maxinputqueue: "); result.append(maxinputqueue); - result.append(", authid: "); - result.append(authid); result.append(", authflag: "); result.append(authflag); - result.append(", authpwd: "); - result.append(authpwd); - result.append(", authfile: "); - result.append(authfile); + result.append(", authlist: "); + result.append(authlist); result.append(", checkschemaflag: "); result.append(checkschemaflag); result.append(", schemafile: "); result.append(schemafile); + result.append(", streamid: "); + result.append(streamid); result.append(')'); return result.toString(); } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java index 136dc7e..3892716 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Controller Service Standardeventcollector Service</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java index b0cc8aa..4269ae8 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java @@ -39,20 +39,20 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getCport <em>Cport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getCsecport <em>Csecport</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystoreloc <em>Keystoreloc</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystorepwd <em>Keystorepwd</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystorealias <em>Keystorealias</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystorepwdloc <em>Keystorepwdloc</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getMaxinputqueue <em>Maxinputqueue</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthid <em>Authid</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthflag <em>Authflag</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthpwd <em>Authpwd</em>}</li> - * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthfile <em>Authfile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthlist <em>Authlist</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getCheckschemaflag <em>Checkschemaflag</em>}</li> * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getSchemafile <em>Schemafile</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getStreamid <em>Streamid</em>}</li> * </ul> - * </p> * * @generated */ @@ -112,59 +112,59 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends */ protected String keystoreloc = KEYSTORELOC_EDEFAULT; /** - * The default value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute. + * The default value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getKeystorepwd() + * @see #getKeystorealias() * @generated * @ordered */ - protected static final String KEYSTOREPWD_EDEFAULT = null; + protected static final String KEYSTOREALIAS_EDEFAULT = null; /** - * The cached value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute. + * The cached value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getKeystorepwd() + * @see #getKeystorealias() * @generated * @ordered */ - protected String keystorepwd = KEYSTOREPWD_EDEFAULT; + protected String keystorealias = KEYSTOREALIAS_EDEFAULT; /** - * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. + * The default value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMaxinputqueue() + * @see #getKeystorepwdloc() * @generated * @ordered */ - protected static final String MAXINPUTQUEUE_EDEFAULT = null; + protected static final String KEYSTOREPWDLOC_EDEFAULT = null; /** - * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. + * The cached value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getMaxinputqueue() + * @see #getKeystorepwdloc() * @generated * @ordered */ - protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT; + protected String keystorepwdloc = KEYSTOREPWDLOC_EDEFAULT; /** - * The default value of the '{@link #getAuthid() <em>Authid</em>}' attribute. + * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthid() + * @see #getMaxinputqueue() * @generated * @ordered */ - protected static final String AUTHID_EDEFAULT = null; + protected static final String MAXINPUTQUEUE_EDEFAULT = null; /** - * The cached value of the '{@link #getAuthid() <em>Authid</em>}' attribute. + * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthid() + * @see #getMaxinputqueue() * @generated * @ordered */ - protected String authid = AUTHID_EDEFAULT; + protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT; /** * The default value of the '{@link #getAuthflag() <em>Authflag</em>}' attribute. * <!-- begin-user-doc --> @@ -184,41 +184,23 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends */ protected String authflag = AUTHFLAG_EDEFAULT; /** - * The default value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAuthpwd() - * @generated - * @ordered - */ - protected static final String AUTHPWD_EDEFAULT = null; - /** - * The cached value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute. + * The default value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthpwd() + * @see #getAuthlist() * @generated * @ordered */ - protected String authpwd = AUTHPWD_EDEFAULT; + protected static final String AUTHLIST_EDEFAULT = null; /** - * The default value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute. + * The cached value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getAuthfile() + * @see #getAuthlist() * @generated * @ordered */ - protected static final String AUTHFILE_EDEFAULT = null; - /** - * The cached value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getAuthfile() - * @generated - * @ordered - */ - protected String authfile = AUTHFILE_EDEFAULT; + protected String authlist = AUTHLIST_EDEFAULT; /** * The default value of the '{@link #getCheckschemaflag() <em>Checkschemaflag</em>}' attribute. * <!-- begin-user-doc --> @@ -256,6 +238,24 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends */ protected String schemafile = SCHEMAFILE_EDEFAULT; /** + * The default value of the '{@link #getStreamid() <em>Streamid</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStreamid() + * @generated + * @ordered + */ + protected static final String STREAMID_EDEFAULT = null; + /** + * The cached value of the '{@link #getStreamid() <em>Streamid</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStreamid() + * @generated + * @ordered + */ + protected String streamid = STREAMID_EDEFAULT; + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -342,8 +342,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public String getKeystorepwd() { - return keystorepwd; + public String getKeystorealias() { + return keystorealias; } /** @@ -351,11 +351,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public void setKeystorepwd(String newKeystorepwd) { - String oldKeystorepwd = keystorepwd; - keystorepwd = newKeystorepwd; + public void setKeystorealias(String newKeystorealias) { + String oldKeystorealias = keystorealias; + keystorealias = newKeystorealias; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD, oldKeystorepwd, keystorepwd)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS, oldKeystorealias, keystorealias)); } /** @@ -363,8 +363,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public String getMaxinputqueue() { - return maxinputqueue; + public String getKeystorepwdloc() { + return keystorepwdloc; } /** @@ -372,11 +372,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public void setMaxinputqueue(String newMaxinputqueue) { - String oldMaxinputqueue = maxinputqueue; - maxinputqueue = newMaxinputqueue; + public void setKeystorepwdloc(String newKeystorepwdloc) { + String oldKeystorepwdloc = keystorepwdloc; + keystorepwdloc = newKeystorepwdloc; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC, oldKeystorepwdloc, keystorepwdloc)); } /** @@ -384,8 +384,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public String getAuthid() { - return authid; + public String getMaxinputqueue() { + return maxinputqueue; } /** @@ -393,11 +393,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public void setAuthid(String newAuthid) { - String oldAuthid = authid; - authid = newAuthid; + public void setMaxinputqueue(String newMaxinputqueue) { + String oldMaxinputqueue = maxinputqueue; + maxinputqueue = newMaxinputqueue; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID, oldAuthid, authid)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue)); } /** @@ -426,8 +426,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public String getAuthpwd() { - return authpwd; + public String getCheckschemaflag() { + return checkschemaflag; } /** @@ -435,11 +435,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public void setAuthpwd(String newAuthpwd) { - String oldAuthpwd = authpwd; - authpwd = newAuthpwd; + public void setCheckschemaflag(String newCheckschemaflag) { + String oldCheckschemaflag = checkschemaflag; + checkschemaflag = newCheckschemaflag; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD, oldAuthpwd, authpwd)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag)); } /** @@ -447,8 +447,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public String getAuthfile() { - return authfile; + public String getSchemafile() { + return schemafile; } /** @@ -456,11 +456,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public void setAuthfile(String newAuthfile) { - String oldAuthfile = authfile; - authfile = newAuthfile; + public void setSchemafile(String newSchemafile) { + String oldSchemafile = schemafile; + schemafile = newSchemafile; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE, oldAuthfile, authfile)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE, oldSchemafile, schemafile)); } /** @@ -468,8 +468,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public String getCheckschemaflag() { - return checkschemaflag; + public String getAuthlist() { + return authlist; } /** @@ -477,11 +477,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public void setCheckschemaflag(String newCheckschemaflag) { - String oldCheckschemaflag = checkschemaflag; - checkschemaflag = newCheckschemaflag; + public void setAuthlist(String newAuthlist) { + String oldAuthlist = authlist; + authlist = newAuthlist; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST, oldAuthlist, authlist)); } /** @@ -489,8 +489,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public String getSchemafile() { - return schemafile; + public String getStreamid() { + return streamid; } /** @@ -498,11 +498,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends * <!-- end-user-doc --> * @generated */ - public void setSchemafile(String newSchemafile) { - String oldSchemafile = schemafile; - schemafile = newSchemafile; + public void setStreamid(String newStreamid) { + String oldStreamid = streamid; + streamid = newStreamid; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE, oldSchemafile, schemafile)); + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID, oldStreamid, streamid)); } /** @@ -519,22 +519,22 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends return getCsecport(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC: return getKeystoreloc(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD: - return getKeystorepwd(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS: + return getKeystorealias(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC: + return getKeystorepwdloc(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE: return getMaxinputqueue(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID: - return getAuthid(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG: return getAuthflag(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD: - return getAuthpwd(); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE: - return getAuthfile(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST: + return getAuthlist(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG: return getCheckschemaflag(); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE: return getSchemafile(); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID: + return getStreamid(); } return super.eGet(featureID, resolve, coreType); } @@ -556,23 +556,20 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC: setKeystoreloc((String)newValue); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD: - setKeystorepwd((String)newValue); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS: + setKeystorealias((String)newValue); + return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC: + setKeystorepwdloc((String)newValue); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE: setMaxinputqueue((String)newValue); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID: - setAuthid((String)newValue); - return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG: setAuthflag((String)newValue); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD: - setAuthpwd((String)newValue); - return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE: - setAuthfile((String)newValue); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST: + setAuthlist((String)newValue); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG: setCheckschemaflag((String)newValue); @@ -580,6 +577,9 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE: setSchemafile((String)newValue); return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID: + setStreamid((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -601,23 +601,20 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC: setKeystoreloc(KEYSTORELOC_EDEFAULT); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD: - setKeystorepwd(KEYSTOREPWD_EDEFAULT); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS: + setKeystorealias(KEYSTOREALIAS_EDEFAULT); + return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC: + setKeystorepwdloc(KEYSTOREPWDLOC_EDEFAULT); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE: setMaxinputqueue(MAXINPUTQUEUE_EDEFAULT); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID: - setAuthid(AUTHID_EDEFAULT); - return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG: setAuthflag(AUTHFLAG_EDEFAULT); return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD: - setAuthpwd(AUTHPWD_EDEFAULT); - return; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE: - setAuthfile(AUTHFILE_EDEFAULT); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST: + setAuthlist(AUTHLIST_EDEFAULT); return; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG: setCheckschemaflag(CHECKSCHEMAFLAG_EDEFAULT); @@ -625,6 +622,9 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE: setSchemafile(SCHEMAFILE_EDEFAULT); return; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID: + setStreamid(STREAMID_EDEFAULT); + return; } super.eUnset(featureID); } @@ -643,22 +643,22 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends return CSECPORT_EDEFAULT == null ? csecport != null : !CSECPORT_EDEFAULT.equals(csecport); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC: return KEYSTORELOC_EDEFAULT == null ? keystoreloc != null : !KEYSTORELOC_EDEFAULT.equals(keystoreloc); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD: - return KEYSTOREPWD_EDEFAULT == null ? keystorepwd != null : !KEYSTOREPWD_EDEFAULT.equals(keystorepwd); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS: + return KEYSTOREALIAS_EDEFAULT == null ? keystorealias != null : !KEYSTOREALIAS_EDEFAULT.equals(keystorealias); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC: + return KEYSTOREPWDLOC_EDEFAULT == null ? keystorepwdloc != null : !KEYSTOREPWDLOC_EDEFAULT.equals(keystorepwdloc); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE: return MAXINPUTQUEUE_EDEFAULT == null ? maxinputqueue != null : !MAXINPUTQUEUE_EDEFAULT.equals(maxinputqueue); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID: - return AUTHID_EDEFAULT == null ? authid != null : !AUTHID_EDEFAULT.equals(authid); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG: return AUTHFLAG_EDEFAULT == null ? authflag != null : !AUTHFLAG_EDEFAULT.equals(authflag); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD: - return AUTHPWD_EDEFAULT == null ? authpwd != null : !AUTHPWD_EDEFAULT.equals(authpwd); - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE: - return AUTHFILE_EDEFAULT == null ? authfile != null : !AUTHFILE_EDEFAULT.equals(authfile); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST: + return AUTHLIST_EDEFAULT == null ? authlist != null : !AUTHLIST_EDEFAULT.equals(authlist); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG: return CHECKSCHEMAFLAG_EDEFAULT == null ? checkschemaflag != null : !CHECKSCHEMAFLAG_EDEFAULT.equals(checkschemaflag); case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE: return SCHEMAFILE_EDEFAULT == null ? schemafile != null : !SCHEMAFILE_EDEFAULT.equals(schemafile); + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID: + return STREAMID_EDEFAULT == null ? streamid != null : !STREAMID_EDEFAULT.equals(streamid); } return super.eIsSet(featureID); } @@ -675,14 +675,14 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CSECPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID; default: return -1; } } @@ -701,14 +701,14 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CPORT; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CSECPORT; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD; - case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG; case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE; + case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID; default: return -1; } } @@ -731,22 +731,22 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends result.append(csecport); result.append(", keystoreloc: "); result.append(keystoreloc); - result.append(", keystorepwd: "); - result.append(keystorepwd); + result.append(", keystorealias: "); + result.append(keystorealias); + result.append(", keystorepwdloc: "); + result.append(keystorepwdloc); result.append(", maxinputqueue: "); result.append(maxinputqueue); - result.append(", authid: "); - result.append(authid); result.append(", authflag: "); result.append(authflag); - result.append(", authpwd: "); - result.append(authpwd); - result.append(", authfile: "); - result.append(authfile); + result.append(", authlist: "); + result.append(authlist); result.append(", checkschemaflag: "); result.append(checkschemaflag); result.append(", schemafile: "); result.append(schemafile); + result.append(", streamid: "); + result.append(streamid); result.append(')'); return result.toString(); } diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java index 3ff2a1e..6ff6910 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java @@ -189,7 +189,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd() { + public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias() { return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(3); } @@ -198,7 +198,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue() { + public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc() { return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(4); } @@ -207,7 +207,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authid() { + public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue() { return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(5); } @@ -225,8 +225,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd() { - return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(7); + public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag() { + return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(8); } /** @@ -234,8 +234,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authfile() { - return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(8); + public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile() { + return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(9); } /** @@ -243,8 +243,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag() { - return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(9); + public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authlist() { + return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(7); } /** @@ -252,7 +252,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile() { + public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Streamid() { return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(10); } @@ -292,14 +292,14 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT); createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT); createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC); - createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD); + createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS); + createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC); createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE); - createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID); createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG); - createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD); - createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE); + createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST); createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG); createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE); + createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID); } /** @@ -347,14 +347,14 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Cport(), theEcorePackage.getEString(), "cport", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Csecport(), theEcorePackage.getEString(), "csecport", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystoreloc(), theEcorePackage.getEString(), "keystoreloc", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd(), theEcorePackage.getEString(), "keystorepwd", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias(), theEcorePackage.getEString(), "keystorealias", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc(), theEcorePackage.getEString(), "keystorepwdloc", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(), theEcorePackage.getEString(), "maxinputqueue", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authid(), theEcorePackage.getEString(), "authid", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authflag(), theEcorePackage.getEString(), "authflag", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd(), theEcorePackage.getEString(), "authpwd", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authfile(), theEcorePackage.getEString(), "authfile", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authlist(), theEcorePackage.getEString(), "authlist", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(), theEcorePackage.getEString(), "checkschemaflag", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(), theEcorePackage.getEString(), "schemafile", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Streamid(), theEcorePackage.getEString(), "streamid", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); @@ -363,7 +363,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { // http://www.eclipse.org/emf/2011/Xcore createXcoreAnnotations(); // http://openecomp.org - createEcompAnnotations(); + createOpenecompAnnotations(); } /** @@ -388,7 +388,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - protected void createEcompAnnotations() { + protected void createOpenecompAnnotations() { String source = "http://openecomp.org"; addAnnotation (getControllerServiceStandardeventcollectorServiceConfiguration_Cport(), @@ -409,19 +409,19 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { "type", "configuration" }); addAnnotation - (getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd(), + (getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias(), source, new String[] { "type", "configuration" }); addAnnotation - (getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(), + (getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc(), source, new String[] { "type", "configuration" }); addAnnotation - (getControllerServiceStandardeventcollectorServiceConfiguration_Authid(), + (getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(), source, new String[] { "type", "configuration" @@ -433,25 +433,25 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { "type", "configuration" }); addAnnotation - (getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd(), + (getControllerServiceStandardeventcollectorServiceConfiguration_Authlist(), source, new String[] { "type", "configuration" }); addAnnotation - (getControllerServiceStandardeventcollectorServiceConfiguration_Authfile(), + (getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(), source, new String[] { "type", "configuration" }); addAnnotation - (getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(), + (getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(), source, new String[] { "type", "configuration" }); addAnnotation - (getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(), + (getControllerServiceStandardeventcollectorServiceConfiguration_Streamid(), source, new String[] { "type", "configuration" diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java index a95ef53..4ab8c92 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java @@ -23,22 +23,19 @@ */ package org.openecomp.dcae.controller.service.standardeventcollector.service.util; -import org.openecomp.dcae.controller.core.service.DcaeService; -import org.openecomp.dcae.controller.core.service.DcaeServiceInstance; - import org.openecomp.dcae.controller.service.docker.DockerService; import org.openecomp.dcae.controller.service.docker.DockerServiceInstance; import org.openecomp.dcae.controller.service.standardeventcollector.service.*; - import org.openecomp.ncomp.core.NamedEntity; - import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; +import org.openecomp.dcae.controller.core.service.DcaeService; +import org.openecomp.dcae.controller.core.service.DcaeServiceInstance; /** * <!-- begin-user-doc --> diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java index d729c31..5997f38 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java @@ -23,20 +23,17 @@ */ package org.openecomp.dcae.controller.service.standardeventcollector.service.util; -import org.openecomp.dcae.controller.core.service.DcaeService; -import org.openecomp.dcae.controller.core.service.DcaeServiceInstance; - import org.openecomp.dcae.controller.service.docker.DockerService; import org.openecomp.dcae.controller.service.docker.DockerServiceInstance; import org.openecomp.dcae.controller.service.standardeventcollector.service.*; - import org.openecomp.ncomp.core.NamedEntity; - import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.util.Switch; +import org.openecomp.dcae.controller.core.service.DcaeService; +import org.openecomp.dcae.controller.core.service.DcaeServiceInstance; /** * <!-- begin-user-doc --> @@ -76,7 +73,7 @@ public class ServiceSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore index 97e6cf1..f63a754 100644 --- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore +++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore @@ -25,13 +25,13 @@ package org.openecomp.dcae.controller.service.standardeventcollector.service
-import org.openecomp.dcae.controller.service.docker.DockerService
+import org.openecomp.dcae.controller.service.docker.DockerService
import org.openecomp.dcae.controller.service.docker.DockerServiceInstance
-annotation "http://openecomp.org" as ecomp
+annotation "http://openecomp.org" as ecomp
class ControllerServiceStandardeventcollectorService extends DockerService {
-
+
}
// state in the controller
@@ -40,8 +40,6 @@ class ControllerServiceStandardeventcollectorServiceInstance extends DockerServi // state in both controller and manager
class ControllerServiceStandardeventcollectorServiceConfiguration {
-// @ecomp(^type = "configuration")
-// String cdapUrl
@ecomp(^type = "configuration")
String cport
@ecomp(^type = "configuration")
@@ -49,23 +47,21 @@ class ControllerServiceStandardeventcollectorServiceConfiguration { @ecomp(^type = "configuration")
String keystoreloc
@ecomp(^type = "configuration")
- String keystorepwd
+ String keystorealias
+ @ecomp(^type = "configuration")
+ String keystorepwdloc
@ecomp(^type = "configuration")
String maxinputqueue
@ecomp(^type = "configuration")
- String authid
- @ecomp(^type = "configuration")
String authflag
- @ecomp(^type = "configuration")
- String authpwd
@ecomp(^type = "configuration")
- String authfile
+ String authlist
@ecomp(^type = "configuration")
String checkschemaflag
@ecomp(^type = "configuration")
String schemafile
-
-
+ @ecomp(^type = "configuration")
+ String streamid
}
|