diff options
Diffstat (limited to 'dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model')
16 files changed, 937 insertions, 62 deletions
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath index 69b19c6..d86c4cf 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath @@ -1,17 +1,33 @@ <?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="optional" value="true"/> + <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"> <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="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.project b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.project index 8a12b36..257e0c2 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.project +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-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-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..447ff97 --- /dev/null +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-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-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs index 4ede96d..ec4300d 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF index b51eaa7..3da1e29 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF @@ -16,15 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.cdap.cluster.manager, 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-vm-model;bundle-version="0.1.0";visibility:=reexport, - ncomp-sirius-manager-agent-model;visibility:=reexport, - dcae-controller-service-cdap-cluster-model;visibility:=reexport, - ncomp-cdap-model;bundle-version="0.1.0";visibility:=reexport + org.eclipse.emf.ecore.xcore.lib Bundle-ActivationPolicy: lazy diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java index 8523dea..90aeb8f 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java @@ -39,6 +39,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.cdap.cluster.manager.ManagerFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.cdap.cluster'" @@ -133,13 +151,40 @@ public interface ManagerPackage extends EPackage { int CDAP_CLUSTER_MANAGER__CLUSTER = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 0; /** + * The feature id for the '<em><b>Cdap Service Servers</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Health Check Script</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Test Timeout</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_MANAGER__TEST_TIMEOUT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 3; + + /** * The number of structural features of the '<em>Cdap Cluster Manager</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER_FEATURE_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 1; + int CDAP_CLUSTER_MANAGER_FEATURE_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 4; /** * The operation id for the '<em>Test</em>' operation. @@ -322,13 +367,22 @@ public interface ManagerPackage extends EPackage { int CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 3; /** + * The operation id for the '<em>Load Artifact With Config</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 4; + + /** * The operation id for the '<em>Delete Artifact</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 4; + int CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 5; /** * The operation id for the '<em>Start Flow</em>' operation. @@ -337,7 +391,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 5; + int CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 6; /** * The operation id for the '<em>Start Worker</em>' operation. @@ -346,7 +400,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___START_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 6; + int CDAP_CLUSTER_MANAGER___START_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 7; /** * The operation id for the '<em>Start Service</em>' operation. @@ -355,7 +409,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___START_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 7; + int CDAP_CLUSTER_MANAGER___START_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 8; /** * The operation id for the '<em>Start App</em>' operation. @@ -364,7 +418,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___START_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 8; + int CDAP_CLUSTER_MANAGER___START_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 9; /** * The operation id for the '<em>Stop App</em>' operation. @@ -373,7 +427,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 9; + int CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 10; /** * The operation id for the '<em>Delete App</em>' operation. @@ -382,7 +436,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___DELETE_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 10; + int CDAP_CLUSTER_MANAGER___DELETE_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 11; /** * The operation id for the '<em>Load Preferences App</em>' operation. @@ -391,7 +445,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 11; + int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 12; /** * The operation id for the '<em>Load Preferences Flow</em>' operation. @@ -400,7 +454,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 12; + int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 13; /** * The operation id for the '<em>Load Preferences Name Space</em>' operation. @@ -409,7 +463,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 13; + int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 14; /** * The operation id for the '<em>Set Preferences App</em>' operation. @@ -418,7 +472,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 14; + int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 15; /** * The operation id for the '<em>Set Preferences Flow</em>' operation. @@ -427,7 +481,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 15; + int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 16; /** * The operation id for the '<em>Set Preferences Worker</em>' operation. @@ -436,7 +490,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 16; + int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 17; /** * The operation id for the '<em>Set Preferences Service</em>' operation. @@ -445,7 +499,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 17; + int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 18; /** * The operation id for the '<em>Set Preferences Name Space</em>' operation. @@ -454,7 +508,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 18; + int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 19; /** * The operation id for the '<em>Set Flow Run Time Args</em>' operation. @@ -463,7 +517,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_FLOW_RUN_TIME_ARGS__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 19; + int CDAP_CLUSTER_MANAGER___SET_FLOW_RUN_TIME_ARGS__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 20; /** * The operation id for the '<em>Set Flowlet Instances</em>' operation. @@ -472,7 +526,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_FLOWLET_INSTANCES__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 20; + int CDAP_CLUSTER_MANAGER___SET_FLOWLET_INSTANCES__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 21; /** * The operation id for the '<em>Stop Flow</em>' operation. @@ -481,7 +535,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___STOP_FLOW__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 21; + int CDAP_CLUSTER_MANAGER___STOP_FLOW__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 22; /** * The operation id for the '<em>Stop Worker</em>' operation. @@ -490,7 +544,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___STOP_WORKER__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 22; + int CDAP_CLUSTER_MANAGER___STOP_WORKER__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 23; /** * The operation id for the '<em>Stop Service</em>' operation. @@ -499,7 +553,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___STOP_SERVICE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 23; + int CDAP_CLUSTER_MANAGER___STOP_SERVICE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 24; /** * The operation id for the '<em>Truncate Data Set</em>' operation. @@ -508,7 +562,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___TRUNCATE_DATA_SET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 24; + int CDAP_CLUSTER_MANAGER___TRUNCATE_DATA_SET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 25; /** * The operation id for the '<em>Delete Dataset</em>' operation. @@ -517,7 +571,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___DELETE_DATASET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 25; + int CDAP_CLUSTER_MANAGER___DELETE_DATASET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 26; /** * The operation id for the '<em>Create Stream</em>' operation. @@ -526,7 +580,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___CREATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 26; + int CDAP_CLUSTER_MANAGER___CREATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 27; /** * The operation id for the '<em>Delete Stream</em>' operation. @@ -535,7 +589,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___DELETE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 27; + int CDAP_CLUSTER_MANAGER___DELETE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 28; /** * The operation id for the '<em>Get Stream Events</em>' operation. @@ -544,7 +598,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___GET_STREAM_EVENTS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 28; + int CDAP_CLUSTER_MANAGER___GET_STREAM_EVENTS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 29; /** * The operation id for the '<em>Get Stream Stats</em>' operation. @@ -553,7 +607,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___GET_STREAM_STATS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 29; + int CDAP_CLUSTER_MANAGER___GET_STREAM_STATS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 30; /** * The operation id for the '<em>Send Event To Stream</em>' operation. @@ -562,7 +616,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SEND_EVENT_TO_STREAM__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 30; + int CDAP_CLUSTER_MANAGER___SEND_EVENT_TO_STREAM__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 31; /** * The operation id for the '<em>Trucate Stream</em>' operation. @@ -571,7 +625,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___TRUCATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 31; + int CDAP_CLUSTER_MANAGER___TRUCATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 32; /** * The operation id for the '<em>Set Stream Properties</em>' operation. @@ -580,7 +634,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_STREAM_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 32; + int CDAP_CLUSTER_MANAGER___SET_STREAM_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 33; /** * The operation id for the '<em>Restart App</em>' operation. @@ -589,7 +643,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___RESTART_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 33; + int CDAP_CLUSTER_MANAGER___RESTART_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 34; /** * The operation id for the '<em>Create App</em>' operation. @@ -598,7 +652,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___CREATE_APP__STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 34; + int CDAP_CLUSTER_MANAGER___CREATE_APP__STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 35; /** * The operation id for the '<em>Create App With Config</em>' operation. @@ -607,7 +661,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 35; + int CDAP_CLUSTER_MANAGER___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 36; /** * The operation id for the '<em>Set Dataset Properties</em>' operation. @@ -616,7 +670,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_DATASET_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 36; + int CDAP_CLUSTER_MANAGER___SET_DATASET_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 37; /** * The operation id for the '<em>Set Stream TTL</em>' operation. @@ -625,7 +679,25 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 37; + int CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 38; + + /** + * The operation id for the '<em>Suspend Schedule</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_MANAGER___SUSPEND_SCHEDULE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 39; + + /** + * The operation id for the '<em>Resume Schedule</em>' operation. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_MANAGER___RESUME_SCHEDULE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 40; /** * The number of operations of the '<em>Cdap Cluster Manager</em>' class. @@ -634,7 +706,7 @@ public interface ManagerPackage extends EPackage { * @generated * @ordered */ - int CDAP_CLUSTER_MANAGER_OPERATION_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 38; + int CDAP_CLUSTER_MANAGER_OPERATION_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 41; /** diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java index 1ff134b..c5710dc 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java @@ -32,12 +32,14 @@ import org.openecomp.ncomp.cdap.CdapApi; import org.openecomp.ncomp.cdap.CdapCluster; import org.openecomp.ncomp.cdap.CdapPackage; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EDataTypeEList; /** * <!-- begin-user-doc --> @@ -45,10 +47,13 @@ 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.cdap.cluster.manager.impl.CdapClusterManagerImpl#getCluster <em>Cluster</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClusterManagerImpl#getCdapServiceServers <em>Cdap Service Servers</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClusterManagerImpl#getHealthCheckScript <em>Health Check Script</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClusterManagerImpl#getTestTimeout <em>Test Timeout</em>}</li> * </ul> - * </p> * * @generated */ @@ -64,6 +69,56 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements protected CdapCluster cluster; /** + * The cached value of the '{@link #getCdapServiceServers() <em>Cdap Service Servers</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCdapServiceServers() + * @generated + * @ordered + */ + protected EList<String> cdapServiceServers; + + /** + * The default value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHealthCheckScript() + * @generated + * @ordered + */ + protected static final String HEALTH_CHECK_SCRIPT_EDEFAULT = "bin/healthCheck.sh"; + + /** + * The cached value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHealthCheckScript() + * @generated + * @ordered + */ + protected String healthCheckScript = HEALTH_CHECK_SCRIPT_EDEFAULT; + + /** + * The default value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTestTimeout() + * @generated + * @ordered + */ + protected static final int TEST_TIMEOUT_EDEFAULT = 60000; + + /** + * The cached value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTestTimeout() + * @generated + * @ordered + */ + protected int testTimeout = TEST_TIMEOUT_EDEFAULT; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -130,6 +185,60 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements * <!-- end-user-doc --> * @generated */ + public EList<String> getCdapServiceServers() { + if (cdapServiceServers == null) { + cdapServiceServers = new EDataTypeEList<String>(String.class, this, ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS); + } + return cdapServiceServers; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getHealthCheckScript() { + return healthCheckScript; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setHealthCheckScript(String newHealthCheckScript) { + String oldHealthCheckScript = healthCheckScript; + healthCheckScript = newHealthCheckScript; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT, oldHealthCheckScript, healthCheckScript)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public int getTestTimeout() { + return testTimeout; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setTestTimeout(int newTestTimeout) { + int oldTestTimeout = testTimeout; + testTimeout = newTestTimeout; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT, oldTestTimeout, testTimeout)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public String createNamespace(String namespace) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT @@ -174,6 +283,17 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements * <!-- end-user-doc --> * @generated */ + public String loadArtifactWithConfig(String namespace, String artifactName, String jarfile, String version, String config) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public String deleteArtifact(String namespace, String artifactName, String artifactVersion) { // TODO: implement this method // Ensure that you remove @generated or mark it @generated NOT @@ -548,6 +668,28 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements * <!-- end-user-doc --> * @generated */ + public String suspendSchedule(String namespace, String appId, String scheduleId) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String resumeSchedule(String namespace, String appId, String scheduleId) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { @@ -567,6 +709,12 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements switch (featureID) { case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER: return getCluster(); + case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS: + return getCdapServiceServers(); + case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT: + return getHealthCheckScript(); + case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT: + return getTestTimeout(); } return super.eGet(featureID, resolve, coreType); } @@ -576,12 +724,23 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER: setCluster((CdapCluster)newValue); return; + case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS: + getCdapServiceServers().clear(); + getCdapServiceServers().addAll((Collection<? extends String>)newValue); + return; + case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT: + setHealthCheckScript((String)newValue); + return; + case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT: + setTestTimeout((Integer)newValue); + return; } super.eSet(featureID, newValue); } @@ -597,6 +756,15 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER: setCluster((CdapCluster)null); return; + case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS: + getCdapServiceServers().clear(); + return; + case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT: + setHealthCheckScript(HEALTH_CHECK_SCRIPT_EDEFAULT); + return; + case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT: + setTestTimeout(TEST_TIMEOUT_EDEFAULT); + return; } super.eUnset(featureID); } @@ -611,6 +779,12 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements switch (featureID) { case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER: return cluster != null; + case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS: + return cdapServiceServers != null && !cdapServiceServers.isEmpty(); + case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT: + return HEALTH_CHECK_SCRIPT_EDEFAULT == null ? healthCheckScript != null : !HEALTH_CHECK_SCRIPT_EDEFAULT.equals(healthCheckScript); + case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT: + return testTimeout != TEST_TIMEOUT_EDEFAULT; } return super.eIsSet(featureID); } @@ -625,6 +799,9 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements if (baseClass == CdapClusterConfiguration.class) { switch (derivedFeatureID) { case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER; + case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS; + case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT; + case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT; default: return -1; } } @@ -646,6 +823,9 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements if (baseClass == CdapClusterConfiguration.class) { switch (baseFeatureID) { case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: return ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: return ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: return ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: return ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT; default: return -1; } } @@ -675,6 +855,7 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements case CdapPackage.CDAP_API___DELETE_NAMESPACE__STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_NAMESPACE__STRING; case CdapPackage.CDAP_API___DEPLOY_APP__STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___DEPLOY_APP__STRING_STRING; case CdapPackage.CDAP_API___LOAD_ARTIFACT__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT__STRING_STRING_STRING_STRING; + case CdapPackage.CDAP_API___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING; case CdapPackage.CDAP_API___DELETE_ARTIFACT__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING; case CdapPackage.CDAP_API___START_FLOW__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING; case CdapPackage.CDAP_API___START_WORKER__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___START_WORKER__STRING_STRING_STRING_STRING; @@ -709,6 +890,8 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements case CdapPackage.CDAP_API___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING; case CdapPackage.CDAP_API___SET_DATASET_PROPERTIES__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___SET_DATASET_PROPERTIES__STRING_STRING_STRING; case CdapPackage.CDAP_API___SET_STREAM_TTL__STRING_STRING_INT: return ManagerPackage.CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT; + case CdapPackage.CDAP_API___SUSPEND_SCHEDULE__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___SUSPEND_SCHEDULE__STRING_STRING_STRING; + case CdapPackage.CDAP_API___RESUME_SCHEDULE__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___RESUME_SCHEDULE__STRING_STRING_STRING; default: return -1; } } @@ -731,6 +914,8 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements return deployApp((String)arguments.get(0), (String)arguments.get(1)); case ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT__STRING_STRING_STRING_STRING: return loadArtifact((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2), (String)arguments.get(3)); + case ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING: + return loadArtifactWithConfig((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2), (String)arguments.get(3), (String)arguments.get(4)); case ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING: return deleteArtifact((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2)); case ManagerPackage.CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING: @@ -799,8 +984,32 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements return setDatasetProperties((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2)); case ManagerPackage.CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT: return setStreamTTL((String)arguments.get(0), (String)arguments.get(1), (Integer)arguments.get(2)); + case ManagerPackage.CDAP_CLUSTER_MANAGER___SUSPEND_SCHEDULE__STRING_STRING_STRING: + return suspendSchedule((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2)); + case ManagerPackage.CDAP_CLUSTER_MANAGER___RESUME_SCHEDULE__STRING_STRING_STRING: + return resumeSchedule((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2)); } return super.eInvoke(operationID, arguments); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (cdapServiceServers: "); + result.append(cdapServiceServers); + result.append(", healthCheckScript: "); + result.append(healthCheckScript); + result.append(", testTimeout: "); + result.append(testTimeout); + result.append(')'); + return result.toString(); + } + } //CdapClusterManagerImpl diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java index 72c1903..e306724 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java @@ -78,7 +78,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-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java index 41d52c0..be93d86 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java @@ -25,6 +25,7 @@ package org.openecomp.dcae.controller.service.cdap.cluster.service; import org.openecomp.ncomp.cdap.CdapCluster; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; /** @@ -34,10 +35,13 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCluster <em>Cluster</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCdapServiceServers <em>Cdap Service Servers</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript <em>Health Check Script</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout <em>Test Timeout</em>}</li> * </ul> - * </p> * * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration() * @model @@ -71,4 +75,74 @@ public interface CdapClusterConfiguration extends EObject { */ void setCluster(CdapCluster value); + /** + * Returns the value of the '<em><b>Cdap Service Servers</b></em>' attribute list. + * The list contents are of type {@link java.lang.String}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Cdap Service Servers</em>' attribute list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Cdap Service Servers</em>' attribute list. + * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration_CdapServiceServers() + * @model unique="false" + * @generated + */ + EList<String> getCdapServiceServers(); + + /** + * Returns the value of the '<em><b>Health Check Script</b></em>' attribute. + * The default value is <code>"bin/healthCheck.sh"</code>. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Health Check Script</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Health Check Script</em>' attribute. + * @see #setHealthCheckScript(String) + * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration_HealthCheckScript() + * @model default="bin/healthCheck.sh" unique="false" + * @generated + */ + String getHealthCheckScript(); + + /** + * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript <em>Health Check Script</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Health Check Script</em>' attribute. + * @see #getHealthCheckScript() + * @generated + */ + void setHealthCheckScript(String value); + + /** + * Returns the value of the '<em><b>Test Timeout</b></em>' attribute. + * The default value is <code>"60000"</code>. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Test Timeout</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Test Timeout</em>' attribute. + * @see #setTestTimeout(int) + * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration_TestTimeout() + * @model default="60000" unique="false" + * @generated + */ + int getTestTimeout(); + + /** + * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout <em>Test Timeout</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Test Timeout</em>' attribute. + * @see #getTestTimeout() + * @generated + */ + void setTestTimeout(int value); + } // CdapClusterConfiguration diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java index fe0d0dc..eef3e40 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java @@ -25,6 +25,7 @@ package org.openecomp.dcae.controller.service.cdap.cluster.service; import org.openecomp.dcae.controller.service.vm.VmPackage; +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; @@ -41,6 +42,24 @@ import org.eclipse.emf.ecore.EReference; * <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.cdap.cluster.service.ServiceFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.cdap.cluster'" @@ -578,13 +597,40 @@ public interface ServicePackage extends EPackage { int CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 0; /** + * The feature id for the '<em><b>Cdap Service Servers</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 1; + + /** + * The feature id for the '<em><b>Health Check Script</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 2; + + /** + * The feature id for the '<em><b>Test Timeout</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 3; + + /** * The number of structural features of the '<em>Cdap Cluster Service Instance</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CDAP_CLUSTER_SERVICE_INSTANCE_FEATURE_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 1; + int CDAP_CLUSTER_SERVICE_INSTANCE_FEATURE_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 4; /** * The number of operations of the '<em>Cdap Cluster Service Instance</em>' class. @@ -615,13 +661,40 @@ public interface ServicePackage extends EPackage { int CDAP_CLUSTER_CONFIGURATION__CLUSTER = 0; /** + * The feature id for the '<em><b>Cdap Service Servers</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS = 1; + + /** + * The feature id for the '<em><b>Health Check Script</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT = 2; + + /** + * The feature id for the '<em><b>Test Timeout</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT = 3; + + /** * The number of structural features of the '<em>Cdap Cluster Configuration</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int CDAP_CLUSTER_CONFIGURATION_FEATURE_COUNT = 1; + int CDAP_CLUSTER_CONFIGURATION_FEATURE_COUNT = 4; /** * The number of operations of the '<em>Cdap Cluster Configuration</em>' class. @@ -675,6 +748,39 @@ public interface ServicePackage extends EPackage { EReference getCdapClusterConfiguration_Cluster(); /** + * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCdapServiceServers <em>Cdap Service Servers</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute list '<em>Cdap Service Servers</em>'. + * @see org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCdapServiceServers() + * @see #getCdapClusterConfiguration() + * @generated + */ + EAttribute getCdapClusterConfiguration_CdapServiceServers(); + + /** + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript <em>Health Check Script</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Health Check Script</em>'. + * @see org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript() + * @see #getCdapClusterConfiguration() + * @generated + */ + EAttribute getCdapClusterConfiguration_HealthCheckScript(); + + /** + * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout <em>Test Timeout</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Test Timeout</em>'. + * @see org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout() + * @see #getCdapClusterConfiguration() + * @generated + */ + EAttribute getCdapClusterConfiguration_TestTimeout(); + + /** * Returns the factory that creates the instances of the model. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -735,6 +841,30 @@ public interface ServicePackage extends EPackage { */ EReference CDAP_CLUSTER_CONFIGURATION__CLUSTER = eINSTANCE.getCdapClusterConfiguration_Cluster(); + /** + * The meta object literal for the '<em><b>Cdap Service Servers</b></em>' attribute list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS = eINSTANCE.getCdapClusterConfiguration_CdapServiceServers(); + + /** + * The meta object literal for the '<em><b>Health Check Script</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT = eINSTANCE.getCdapClusterConfiguration_HealthCheckScript(); + + /** + * The meta object literal for the '<em><b>Test Timeout</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT = eINSTANCE.getCdapClusterConfiguration_TestTimeout(); + } } //ServicePackage diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java index 53ae6de..0ab8271 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java @@ -28,14 +28,17 @@ import org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage import org.openecomp.ncomp.cdap.CdapCluster; +import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.emf.ecore.util.EDataTypeEList; /** * <!-- begin-user-doc --> @@ -43,10 +46,13 @@ 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.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getCluster <em>Cluster</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getCdapServiceServers <em>Cdap Service Servers</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getHealthCheckScript <em>Health Check Script</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getTestTimeout <em>Test Timeout</em>}</li> * </ul> - * </p> * * @generated */ @@ -62,6 +68,56 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i protected CdapCluster cluster; /** + * The cached value of the '{@link #getCdapServiceServers() <em>Cdap Service Servers</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCdapServiceServers() + * @generated + * @ordered + */ + protected EList<String> cdapServiceServers; + + /** + * The default value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHealthCheckScript() + * @generated + * @ordered + */ + protected static final String HEALTH_CHECK_SCRIPT_EDEFAULT = "bin/healthCheck.sh"; + + /** + * The cached value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHealthCheckScript() + * @generated + * @ordered + */ + protected String healthCheckScript = HEALTH_CHECK_SCRIPT_EDEFAULT; + + /** + * The default value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTestTimeout() + * @generated + * @ordered + */ + protected static final int TEST_TIMEOUT_EDEFAULT = 60000; + + /** + * The cached value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTestTimeout() + * @generated + * @ordered + */ + protected int testTimeout = TEST_TIMEOUT_EDEFAULT; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -128,6 +184,60 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + public EList<String> getCdapServiceServers() { + if (cdapServiceServers == null) { + cdapServiceServers = new EDataTypeEList<String>(String.class, this, ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS); + } + return cdapServiceServers; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getHealthCheckScript() { + return healthCheckScript; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setHealthCheckScript(String newHealthCheckScript) { + String oldHealthCheckScript = healthCheckScript; + healthCheckScript = newHealthCheckScript; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT, oldHealthCheckScript, healthCheckScript)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public int getTestTimeout() { + return testTimeout; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setTestTimeout(int newTestTimeout) { + int oldTestTimeout = testTimeout; + testTimeout = newTestTimeout; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT, oldTestTimeout, testTimeout)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { @@ -147,6 +257,12 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i switch (featureID) { case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: return getCluster(); + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: + return getCdapServiceServers(); + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: + return getHealthCheckScript(); + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: + return getTestTimeout(); } return super.eGet(featureID, resolve, coreType); } @@ -156,12 +272,23 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: setCluster((CdapCluster)newValue); return; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: + getCdapServiceServers().clear(); + getCdapServiceServers().addAll((Collection<? extends String>)newValue); + return; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: + setHealthCheckScript((String)newValue); + return; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: + setTestTimeout((Integer)newValue); + return; } super.eSet(featureID, newValue); } @@ -177,6 +304,15 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: setCluster((CdapCluster)null); return; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: + getCdapServiceServers().clear(); + return; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: + setHealthCheckScript(HEALTH_CHECK_SCRIPT_EDEFAULT); + return; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: + setTestTimeout(TEST_TIMEOUT_EDEFAULT); + return; } super.eUnset(featureID); } @@ -191,8 +327,34 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i switch (featureID) { case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: return cluster != null; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: + return cdapServiceServers != null && !cdapServiceServers.isEmpty(); + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: + return HEALTH_CHECK_SCRIPT_EDEFAULT == null ? healthCheckScript != null : !HEALTH_CHECK_SCRIPT_EDEFAULT.equals(healthCheckScript); + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: + return testTimeout != TEST_TIMEOUT_EDEFAULT; } return super.eIsSet(featureID); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (cdapServiceServers: "); + result.append(cdapServiceServers); + result.append(", healthCheckScript: "); + result.append(healthCheckScript); + result.append(", testTimeout: "); + result.append(testTimeout); + result.append(')'); + return result.toString(); + } + } //CdapClusterConfigurationImpl diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java index 2021586..b986cfb 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Cdap Cluster Service</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java index 7e31876..abfca1b 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java @@ -31,13 +31,16 @@ import org.openecomp.dcae.controller.service.vm.impl.VirtualMachineServiceInstan import org.openecomp.ncomp.cdap.CdapCluster; +import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EDataTypeEList; /** * <!-- begin-user-doc --> @@ -45,10 +48,13 @@ 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.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getCluster <em>Cluster</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getCdapServiceServers <em>Cdap Service Servers</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getHealthCheckScript <em>Health Check Script</em>}</li> + * <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getTestTimeout <em>Test Timeout</em>}</li> * </ul> - * </p> * * @generated */ @@ -64,6 +70,56 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc protected CdapCluster cluster; /** + * The cached value of the '{@link #getCdapServiceServers() <em>Cdap Service Servers</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getCdapServiceServers() + * @generated + * @ordered + */ + protected EList<String> cdapServiceServers; + + /** + * The default value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHealthCheckScript() + * @generated + * @ordered + */ + protected static final String HEALTH_CHECK_SCRIPT_EDEFAULT = "bin/healthCheck.sh"; + + /** + * The cached value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHealthCheckScript() + * @generated + * @ordered + */ + protected String healthCheckScript = HEALTH_CHECK_SCRIPT_EDEFAULT; + + /** + * The default value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTestTimeout() + * @generated + * @ordered + */ + protected static final int TEST_TIMEOUT_EDEFAULT = 60000; + + /** + * The cached value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTestTimeout() + * @generated + * @ordered + */ + protected int testTimeout = TEST_TIMEOUT_EDEFAULT; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -130,6 +186,60 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc * <!-- end-user-doc --> * @generated */ + public EList<String> getCdapServiceServers() { + if (cdapServiceServers == null) { + cdapServiceServers = new EDataTypeEList<String>(String.class, this, ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS); + } + return cdapServiceServers; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getHealthCheckScript() { + return healthCheckScript; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setHealthCheckScript(String newHealthCheckScript) { + String oldHealthCheckScript = healthCheckScript; + healthCheckScript = newHealthCheckScript; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT, oldHealthCheckScript, healthCheckScript)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public int getTestTimeout() { + return testTimeout; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setTestTimeout(int newTestTimeout) { + int oldTestTimeout = testTimeout; + testTimeout = newTestTimeout; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT, oldTestTimeout, testTimeout)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { @@ -149,6 +259,12 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc switch (featureID) { case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER: return getCluster(); + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS: + return getCdapServiceServers(); + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT: + return getHealthCheckScript(); + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT: + return getTestTimeout(); } return super.eGet(featureID, resolve, coreType); } @@ -158,12 +274,23 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER: setCluster((CdapCluster)newValue); return; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS: + getCdapServiceServers().clear(); + getCdapServiceServers().addAll((Collection<? extends String>)newValue); + return; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT: + setHealthCheckScript((String)newValue); + return; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT: + setTestTimeout((Integer)newValue); + return; } super.eSet(featureID, newValue); } @@ -179,6 +306,15 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER: setCluster((CdapCluster)null); return; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS: + getCdapServiceServers().clear(); + return; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT: + setHealthCheckScript(HEALTH_CHECK_SCRIPT_EDEFAULT); + return; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT: + setTestTimeout(TEST_TIMEOUT_EDEFAULT); + return; } super.eUnset(featureID); } @@ -193,6 +329,12 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc switch (featureID) { case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER: return cluster != null; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS: + return cdapServiceServers != null && !cdapServiceServers.isEmpty(); + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT: + return HEALTH_CHECK_SCRIPT_EDEFAULT == null ? healthCheckScript != null : !HEALTH_CHECK_SCRIPT_EDEFAULT.equals(healthCheckScript); + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT: + return testTimeout != TEST_TIMEOUT_EDEFAULT; } return super.eIsSet(featureID); } @@ -207,6 +349,9 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc if (baseClass == CdapClusterConfiguration.class) { switch (derivedFeatureID) { case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT; + case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT; default: return -1; } } @@ -223,10 +368,33 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc if (baseClass == CdapClusterConfiguration.class) { switch (baseFeatureID) { case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT; + case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT; default: return -1; } } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (cdapServiceServers: "); + result.append(cdapServiceServers); + result.append(", healthCheckScript: "); + result.append(healthCheckScript); + result.append(", testTimeout: "); + result.append(testTimeout); + result.append(')'); + return result.toString(); + } + } //CdapClusterServiceInstanceImpl diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java index f39f5c0..867aebb 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java @@ -28,11 +28,17 @@ import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterSer import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance; import org.openecomp.dcae.controller.service.cdap.cluster.service.ServiceFactory; import org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage; + import org.openecomp.dcae.controller.service.vm.VmPackage; + import org.openecomp.ncomp.cdap.CdapPackage; + +import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; + +import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; /** @@ -110,8 +116,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { isInited = true; // Initialize simple dependencies - CdapPackage.eINSTANCE.eClass(); VmPackage.eINSTANCE.eClass(); + CdapPackage.eINSTANCE.eClass(); // Create package meta-data objects theServicePackage.createPackageContents(); @@ -169,6 +175,33 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ + public EAttribute getCdapClusterConfiguration_CdapServiceServers() { + return (EAttribute)cdapClusterConfigurationEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getCdapClusterConfiguration_HealthCheckScript() { + return (EAttribute)cdapClusterConfigurationEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getCdapClusterConfiguration_TestTimeout() { + return (EAttribute)cdapClusterConfigurationEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public ServiceFactory getServiceFactory() { return (ServiceFactory)getEFactoryInstance(); } @@ -198,6 +231,9 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { cdapClusterConfigurationEClass = createEClass(CDAP_CLUSTER_CONFIGURATION); createEReference(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__CLUSTER); + createEAttribute(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS); + createEAttribute(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT); + createEAttribute(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT); } /** @@ -226,6 +262,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { // Obtain other dependent packages VmPackage theVmPackage = (VmPackage)EPackage.Registry.INSTANCE.getEPackage(VmPackage.eNS_URI); CdapPackage theCdapPackage = (CdapPackage)EPackage.Registry.INSTANCE.getEPackage(CdapPackage.eNS_URI); + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); // Create type parameters @@ -243,6 +280,9 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { initEClass(cdapClusterConfigurationEClass, CdapClusterConfiguration.class, "CdapClusterConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getCdapClusterConfiguration_Cluster(), theCdapPackage.getCdapCluster(), null, "cluster", null, 0, 1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCdapClusterConfiguration_CdapServiceServers(), theEcorePackage.getEString(), "cdapServiceServers", null, 0, -1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCdapClusterConfiguration_HealthCheckScript(), theEcorePackage.getEString(), "healthCheckScript", "bin/healthCheck.sh", 0, 1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getCdapClusterConfiguration_TestTimeout(), theEcorePackage.getEInt(), "testTimeout", "60000", 0, 1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); @@ -251,7 +291,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { // http://www.eclipse.org/emf/2011/Xcore createXcoreAnnotations(); // http://openecomp.org - createEcompAnnotations(); + createOpenecompAnnotations(); } /** @@ -276,7 +316,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage { * <!-- end-user-doc --> * @generated */ - protected void createEcompAnnotations() { + protected void createOpenecompAnnotations() { String source = "http://openecomp.org"; addAnnotation (getCdapClusterConfiguration_Cluster(), diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java index 3d25b7c..c01475f 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java @@ -77,7 +77,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-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore index 0b3c18c..4c8d734 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore @@ -40,6 +40,9 @@ class CdapClusterServiceInstance extends VirtualMachineServiceInstance, CdapClus class CdapClusterConfiguration {
@ecomp(^type = "configuration")
contains CdapCluster cluster
+ String[] cdapServiceServers
+ String healthCheckScript = "bin/healthCheck.sh"
+ int testTimeout = "60000"
}
|