summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src
diff options
context:
space:
mode:
authorAviZi <avi.ziv@amdocs.com>2017-06-09 02:39:56 +0300
committerAviZi <avi.ziv@amdocs.com>2017-06-09 02:39:56 +0300
commit280f8015d06af1f41a3ef12e8300801c7a5e0d54 (patch)
tree9c1d3978c04cd28068f02073038c936bb49ca9e0 /openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src
parentfd3821dad11780d33c5373d74c957c442489945e (diff)
[SDC-29] Amdocs OnBoard 1707 initial commit.
Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi <avi.ziv@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src')
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/EnrichmentArtifactsServiceFactoryImpl.java34
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/enrichmentartifacts/EnrichmentArtifactsServiceImpl.java61
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java38
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java146
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST.yaml350
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST_01.yaml350
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/VariouseST.yaml363
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST.yaml550
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST_01.yaml550
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/VariouseST.yaml363
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST.yaml550
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST_01.yaml550
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml13
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml1202
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/MainServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/OnlyComponentsST.yaml)24
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml284
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/input/MainServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/OnlyComponentsST_01.yaml)24
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml)45
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml)6
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml)145
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ComputeGlobalTypesServiceTemplate.yaml11
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml166
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml91
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml)20
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml66
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml156
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml71
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml141
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml)21
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml)18
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml)16
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NetworkGlobalTypesServiceTemplate.yaml11
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml)8
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml)6
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml)12
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml (renamed from openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml)22
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/PortGlobalTypesServiceTemplate.yaml11
37 files changed, 2585 insertions, 3910 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/EnrichmentArtifactsServiceFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/EnrichmentArtifactsServiceFactoryImpl.java
deleted file mode 100644
index 1075b07a49..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/EnrichmentArtifactsServiceFactoryImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.sdc.enrichment;
-
-import org.openecomp.core.enrichment.EnrichmentArtifactsServiceFactory;
-import org.openecomp.core.enrichment.enrichmentartifacts.EnrichmentArtifactsService;
-import org.openecomp.sdc.enrichment.enrichmentartifacts.EnrichmentArtifactsServiceImpl;
-
-public class EnrichmentArtifactsServiceFactoryImpl extends EnrichmentArtifactsServiceFactory {
- private static EnrichmentArtifactsService INSTANCE = new EnrichmentArtifactsServiceImpl();
-
- @Override
- public EnrichmentArtifactsService createInterface() {
- return INSTANCE;
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/enrichmentartifacts/EnrichmentArtifactsServiceImpl.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/enrichmentartifacts/EnrichmentArtifactsServiceImpl.java
deleted file mode 100644
index 2b7fef1e6b..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/enrichmentartifacts/EnrichmentArtifactsServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.sdc.enrichment.enrichmentartifacts;
-
-import org.openecomp.core.enrichment.enrichmentartifacts.EnrichmentArtifactsService;
-import org.openecomp.core.model.dao.EnrichedServiceModelDao;
-import org.openecomp.core.model.dao.EnrichedServiceModelDaoFactory;
-import org.openecomp.core.model.types.ServiceArtifact;
-import org.openecomp.core.model.types.ServiceElement;
-import org.openecomp.core.utilities.file.FileContentHandler;
-import org.openecomp.sdc.common.utils.AsdcCommon;
-import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
-import org.openecomp.sdc.versioning.dao.types.Version;
-
-import java.util.List;
-
-public class EnrichmentArtifactsServiceImpl implements EnrichmentArtifactsService {
- EnrichedServiceModelDao<ToscaServiceModel, ServiceElement> enrichedServiceModelDao =
- EnrichedServiceModelDaoFactory.getInstance().createInterface();
-
- @Override
- public FileContentHandler addMibs(String vspId, Version version) {
- FileContentHandler externalArtifacts = new FileContentHandler();
- List<ServiceArtifact> mibsList = enrichedServiceModelDao.getExternalArtifacts(vspId, version);
- addMibsToFileContentHandler(mibsList, externalArtifacts);
-
- return externalArtifacts;
- }
-
-
- private void addMibsToFileContentHandler(List<ServiceArtifact> mibsList,
- FileContentHandler externalArtifacts) {
- for (ServiceArtifact serviceArtifact : mibsList) {
- String filename = serviceArtifact.getName();
- externalArtifacts.addFile(filename, serviceArtifact.getContent());
- }
- }
-
-
- private boolean isFileArtifact(String filename) {
- return !filename.contains(AsdcCommon.HEAT_META) && !filename.contains(AsdcCommon.MANIFEST_NAME);
- }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java
index ef29108402..06b157b92c 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/main/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImpl.java
@@ -22,62 +22,62 @@ package org.openecomp.sdc.enrichment.impl;
import org.openecomp.core.enrichment.api.EnrichmentManager;
import org.openecomp.core.enrichment.types.EntityInfo;
+import org.openecomp.sdc.logging.api.Logger;
+import org.openecomp.sdc.logging.api.LoggerFactory;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.enrichment.EnrichmentInfo;
import org.openecomp.sdc.enrichment.factory.EnricherHandlerFactory;
import org.openecomp.sdc.enrichment.inter.Enricher;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.versioning.dao.types.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class EnrichmentManagerImpl implements EnrichmentManager<ToscaServiceModel> {
- private static Logger logger = LoggerFactory.getLogger(EnrichmentManagerImpl.class);
+ private static Logger logger = (Logger) LoggerFactory.getLogger(EnrichmentManagerImpl.class);
- private EnrichmentInfo input = null;
+ private EnrichmentInfo data = null;
private ToscaServiceModel model;
@Override
public Map<String, List<ErrorMessage>> enrich() {
+ Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>();
List<Enricher> enricherList =
EnricherHandlerFactory.getInstance().createInterface().getEnrichers();
for (Enricher enricher : enricherList) {
- enricher.setInput(input);
+ enricher.setData(data);
enricher.setModel(model);
- enricher.enrich();
+ enrichErrors.putAll(enricher.enrich());
}
- return null;
+ return enrichErrors;
}
@Override
- public void addEntityInput(String type, EntityInfo info) {
- this.input.addEntityInfo(type, info);
+ public void addEntityInfo(String entityKey, EntityInfo entityInfo) {
+ this.data.addEntityInfo(entityKey, entityInfo);
}
@Override
- public void initInput(String key, Version version) {
- input = new EnrichmentInfo();
- input.setKey(key);
- input.setVersion(version);
+ public void init(String key, Version version) {
+ data = new EnrichmentInfo();
+ data.setKey(key);
+ data.setVersion(version);
}
@Override
- public void addModel(ToscaServiceModel model) {
-
- this.model = model;
+ public ToscaServiceModel getModel() {
+ return this.model;
}
-
@Override
- public ToscaServiceModel getModel() {
- return this.model;
+ public void setModel(ToscaServiceModel model) {
+ this.model = model;
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java
index 6bc5a0e864..dfdbaef896 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/java/org/openecomp/sdc/enrichment/impl/EnrichmentManagerImplTest.java
@@ -1,30 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * 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.sdc.enrichment.impl;
-import org.openecomp.sdc.enrichment.impl.tosca.ComponentInfo;
+import static org.junit.Assert.assertEquals;
+
+import org.openecomp.core.enrichment.api.EnrichmentManager;
+import org.openecomp.core.enrichment.factory.EnrichmentManagerFactory;
+import org.openecomp.core.utilities.file.FileUtils;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
import org.openecomp.sdc.tosca.services.ToscaFileOutputService;
import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl;
import org.openecomp.sdc.tosca.services.yamlutil.ToscaExtensionYamlUtil;
import org.openecomp.sdc.versioning.dao.types.Version;
-import org.openecomp.core.enrichment.api.EnrichmentManager;
-import org.openecomp.core.enrichment.factory.EnrichmentManagerFactory;
-
-import org.openecomp.core.enrichment.types.CeilometerInfo;
-import org.openecomp.core.enrichment.types.ComponentCeilometerInfo;
-import org.openecomp.core.utilities.file.FileUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.nio.file.NotDirectoryException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import static org.junit.Assert.assertEquals;
-
public class EnrichmentManagerImplTest {
@@ -88,100 +113,15 @@ public class EnrichmentManagerImplTest {
}
}
-// @Test
+ @Test
public void testEnrichmentManagerImpl() throws Exception {
Assert.assertTrue(
EnrichmentManagerFactory.getInstance().createInterface() instanceof EnrichmentManagerImpl);
}
-// @Test
- public void testEnrichModel() throws Exception {
- ToscaServiceModel toscaServiceModel =
- loadToscaServiceModel("/extractServiceComposition/onlyComponents/",
- "/extractServiceComposition/toscaGlobalServiceTemplates/", "OnlyComponentsST.yaml");
- EnrichmentManager enrichmentManager = EnrichmentManagerFactory.getInstance().createInterface();
- enrichmentManager.initInput("vsp_enrich", new Version(0, 1));
- enrichmentManager.addModel(toscaServiceModel);
-
- String[] componentNames = new String[]{"org.openecomp.resource.vfc.nodes.heat.pcrf_psm",
- "org.openecomp.resource.vfc.nodes.heat.pcm"};
- ComponentInfo componentInfo = new ComponentInfo();
-
- CeilometerInfo ceilometerInfo;
- ComponentCeilometerInfo componentCeilometerInfo = new ComponentCeilometerInfo();
- componentCeilometerInfo.setCeilometerInfoList(new ArrayList<>());
- componentInfo.setCeilometerInfo(componentCeilometerInfo);
-
- for (String componentName : componentNames) {
- ceilometerInfo =
- getCeilometerInfo("instance", "Gauge", "instance", "compute", "Existence of instance");
- componentInfo.getCeilometerInfo().getCeilometerInfoList().add(ceilometerInfo);
- ceilometerInfo = getCeilometerInfo("memory", "Gauge", "MB", "compute",
- "Volume of RAM allocated to the instance");
- componentInfo.getCeilometerInfo().getCeilometerInfoList().add(ceilometerInfo);
- ceilometerInfo = getCeilometerInfo("cpu", "Cumulative", "ns", "compute", "CPU time used");
- componentInfo.getCeilometerInfo().getCeilometerInfoList().add(ceilometerInfo);
- enrichmentManager.addEntityInput(componentName, componentInfo);
- }
-
- enrichmentManager.enrich();
-
- File csrFile = getToscaModelAsFile(toscaServiceModel);
- compareActualAndExpected(csrFile);
-
- }
-
-// @Test
- public void testAllEnrichModel() throws Exception {
- ToscaServiceModel toscaServiceModel = loadToscaServiceModel("/extractServiceComposition/all/",
- "/extractServiceComposition/toscaGlobalServiceTemplates/", "OnlyComponentsST.yaml");
- EnrichmentManager enrichmentManager = EnrichmentManagerFactory.getInstance().createInterface();
- enrichmentManager.initInput("vsp_enrich", new Version(0, 1));
- enrichmentManager.addModel(toscaServiceModel);
-
- String[] componentNames = new String[]{"org.openecomp.resource.vfc.nodes.heat.pcrf_psm",
- "org.openecomp.resource.vfc.nodes.heat.pcm"};
- ComponentInfo componentInfo = new ComponentInfo();
-
- CeilometerInfo ceilometerInfo;
- ComponentCeilometerInfo componentCeilometerInfo = new ComponentCeilometerInfo();
- componentCeilometerInfo.setCeilometerInfoList(new ArrayList<>());
- componentInfo.setCeilometerInfo(componentCeilometerInfo);
-
- for (String componentName : componentNames) {
- ceilometerInfo =
- getCeilometerInfo("instance", "Gauge", "instance", "compute", "Existence of instance");
- componentInfo.getCeilometerInfo().getCeilometerInfoList().add(ceilometerInfo);
- ceilometerInfo = getCeilometerInfo("memory", "Gauge", "MB", "compute",
- "Volume of RAM allocated to the instance");
- componentInfo.getCeilometerInfo().getCeilometerInfoList().add(ceilometerInfo);
- ceilometerInfo = getCeilometerInfo("cpu", "Cumulative", "ns", "compute", "CPU time used");
- componentInfo.getCeilometerInfo().getCeilometerInfoList().add(ceilometerInfo);
- enrichmentManager.addEntityInput(componentName, componentInfo);
- }
-
- enrichmentManager.enrich();
-
- File csrFile = getToscaModelAsFile(toscaServiceModel);
- compareActualAndExpected(csrFile);
-
- }
-
- private CeilometerInfo getCeilometerInfo(String name, String type, String unit, String category,
- String description) {
- CeilometerInfo ceilometerInfo = new CeilometerInfo();
- ceilometerInfo.setName(name);
- ceilometerInfo.setType(type);
- ceilometerInfo.setUnit(unit);
- ceilometerInfo.setCategory(category);
- ceilometerInfo.setDescription(description);
- return ceilometerInfo;
- }
-
private File getToscaModelAsFile(ToscaServiceModel toscaServiceModel) throws IOException {
- URL inputFilesUrl =
- EnrichmentManagerImplTest.class.getResource("/extractServiceComposition/onlyComponents");
+ URL inputFilesUrl = EnrichmentManagerImplTest.class.getResource("/mock/enrich/input");
String path = inputFilesUrl.getPath();
@@ -198,16 +138,16 @@ public class EnrichmentManagerImplTest {
return file;
}
- protected void compareActualAndExpected(File actualFile) throws IOException {
+ protected void compareActualAndExpected(File actualFile, String expectedOutputPath)
+ throws IOException {
- URL url = EnrichmentManagerImplTest.class
- .getResource("/extractServiceComposition/onlyComponents/expectedOutput");
+ URL url = EnrichmentManagerImplTest.class.getResource(expectedOutputPath);
Set<String> expectedResultFileNameSet = new HashSet<>();
Map<String, byte[]> expectedResultMap = new HashMap<>();
String path = url.getPath();
File pathFile = new File(path);
File[] files = pathFile.listFiles();
- org.junit.Assert.assertNotNull("manifest files is empty", files);
+ org.junit.Assert.assertNotNull("model is empty", files);
for (File expectedFile : files) {
expectedResultFileNameSet.add(expectedFile.getName());
try (FileInputStream input = new FileInputStream(expectedFile)) {
@@ -242,4 +182,4 @@ public class EnrichmentManagerImplTest {
}
-} \ No newline at end of file
+}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST.yaml
deleted file mode 100644
index 54f39e4219..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST.yaml
+++ /dev/null
@@ -1,350 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST_01.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST_01.yaml
deleted file mode 100644
index 54f39e4219..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/OnlyComponentsST_01.yaml
+++ /dev/null
@@ -1,350 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/VariouseST.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/VariouseST.yaml
deleted file mode 100644
index 1f39bfb314..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/VariouseST.yaml
+++ /dev/null
@@ -1,363 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
-
- jsa_net:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- shared: true
- network_name:
- get_input: jsa_net_name
- jsa_net1:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- shared: true
- network_name:
- get_input: jsa_net_name
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST.yaml
deleted file mode 100644
index 9ec1aa2a8d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST.yaml
+++ /dev/null
@@ -1,550 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST_01.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST_01.yaml
deleted file mode 100644
index 9ec1aa2a8d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/OnlyComponentsST_01.yaml
+++ /dev/null
@@ -1,550 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/VariouseST.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/VariouseST.yaml
deleted file mode 100644
index 1f39bfb314..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/all/expectedOutput/VariouseST.yaml
+++ /dev/null
@@ -1,363 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
-
- jsa_net:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- shared: true
- network_name:
- get_input: jsa_net_name
- jsa_net1:
- type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
- properties:
- shared: true
- network_name:
- get_input: jsa_net_name
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST.yaml
deleted file mode 100644
index 9ec1aa2a8d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST.yaml
+++ /dev/null
@@ -1,550 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST_01.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST_01.yaml
deleted file mode 100644
index 9ec1aa2a8d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/expectedOutput/OnlyComponentsST_01.yaml
+++ /dev/null
@@ -1,550 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
- NeutronPortGlobalTypes:
- file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
- file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
- file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
- file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
- file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
- file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
- file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
- file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
- file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- org.openecomp.resource.vfc.nodes.heat.pcm:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
- capabilities:
- instance:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Existence of instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: instance
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: instance
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- memory:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: Volume of RAM allocated to the instance
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: memory
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: MB
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Gauge
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
- cpu:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: CPU time used
- properties:
- name:
- type: string
- description: Ceilometer metric type name to monitor. (The name ceilometer is using)
- required: true
- default: cpu
- status: SUPPORTED
- description:
- type: string
- description: Description of the metric
- required: false
- status: SUPPORTED
- unit:
- type: string
- description: Unit of the metric value
- required: true
- default: ns
- status: SUPPORTED
- type:
- type: string
- description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
- required: true
- default: Cumulative
- status: SUPPORTED
- category:
- type: string
- description: Category of the metric, for an example, compute, disk, network, storage and etc.
- required: false
- default: compute
- status: SUPPORTED
-topology_template:
- inputs:
- Internal2_name:
- label: Internal2_name
- hidden: false
- immutable: false
- type: string
- description: Internal2_name
- Internal1_shared:
- label: Internal1_shared
- hidden: false
- immutable: false
- type: string
- description: Internal1_shared
- FSB1_volume_name:
- label: FSB1_volume
- hidden: false
- immutable: false
- type: string
- description: FSB1_volume_1
- jsa_cidr:
- label: jsa_cidr
- hidden: false
- immutable: false
- type: string
- description: jsa_cidr
- default: 107.243.7.128/26
- availabilityzone_name:
- label: availabilityzone_name
- hidden: false
- immutable: false
- type: string
- description: availabilityzone_name
- fsb1-name:
- label: FSB1_name
- hidden: false
- immutable: false
- type: string
- description: FSB1_name
- pcm_image_name:
- label: pcm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcm_image_name
- Internal2_external:
- label: Internal2_external
- hidden: false
- immutable: false
- type: string
- description: Internal2_external
- Internal2_forwarding_mode:
- label: Internal2_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal2_forwarding_mode
- pcrf_psm_flavor_name:
- label: pcrf_psm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_flavor_name
- pcrf_psm_image_name:
- label: pcrf_psm_image_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_image_name
- FSB_1_image:
- label: MME_FSB1
- hidden: false
- immutable: false
- type: string
- description: MME_FSB1_15B-CP04-r5a01
- volume_size:
- label: volume size
- hidden: false
- immutable: false
- type: float
- description: my volume size 320GB
- fsb1-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal2_shared:
- label: Internal2_shared
- hidden: false
- immutable: false
- type: string
- description: Internal2_shared
- pcm_server_name:
- label: pcm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcm_server_name
- Internal1_net_name:
- label: Internal1_net_name
- hidden: false
- immutable: false
- type: string
- description: Internal1_net_name
- oam_net_name:
- label: oam_net_name
- hidden: false
- immutable: false
- type: string
- description: oam_net_name
- fsb1-flavor:
- label: FSB1_flavor
- hidden: false
- immutable: false
- type: string
- description: FSB1_flavor
- fsb1-Internal2-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- volume_type:
- label: volume type
- hidden: false
- immutable: false
- type: string
- description: volume type Gold
- fsb1-zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- fsb_zone:
- label: FSB1_zone
- hidden: false
- immutable: false
- type: string
- description: FSB1_zone
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- jsa_net_name:
- label: jsa_net_name
- hidden: false
- immutable: false
- type: string
- description: jsa_net_name
- default: jsa_log_net_0
- pcrf_psm_server_name:
- label: pcrf_psm_server_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_psm_server_name
- pcm_flavor_name:
- label: pcm_flavor_name
- hidden: false
- immutable: false
- type: string
- description: pcm_flavor_name
- oam_net_id:
- label: oam_net_id
- hidden: false
- immutable: false
- type: string
- description: oam_net_id
- fsb2-Internal1-mac:
- label: FSB1_internal_mac
- hidden: false
- immutable: false
- type: string
- description: FSB1_internal_mac
- Internal1_forwarding_mode:
- label: Internal1_forwarding_mode
- hidden: false
- immutable: false
- type: string
- description: Internal1_forwarding_mode
- pcrf_cps_net_name:
- label: pcrf_cps_net_name
- hidden: false
- immutable: false
- type: string
- description: pcrf_cps_net_name
- cps_net_name:
- label: cps_net_name
- hidden: false
- immutable: false
- type: string
- description: cps_net_name
- pcrf_security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: String
- Internal1_external:
- label: Internal1_external
- hidden: false
- immutable: false
- type: string
- description: Internal1_external
- node_templates:
- nova_local_type_pcm1:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcm2:
- type: org.openecomp.resource.vfc.nodes.heat.pcm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_local_type_pcrf_psm:
- type: org.openecomp.resource.vfc.nodes.heat.pcrf_psm
- properties:
- flavor:
- get_input: pcm_flavor_name
- availability_zone:
- get_input: availabilityzone_name
- image:
- get_input: pcm_image_name
- config_drive: 'True'
- user_data_format: RAW
- name:
- get_input: pcm_server_name
- user_data: UNSUPPORTED_RESOURCE_server_init
- nova_global_type1:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- name:
- get_input: fsb1-name
- nova_global_type2:
- type: org.openecomp.resource.vfc.nodes.heat.nova.Server
- properties:
- flavor:
- get_input: fsb1-flavor
- availability_zone:
- get_input: fsb_zone
- metadata:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet
- params:
- $dev: eth0
- $netmask:
- get_input: cps_net_mask
- $ip:
- get_input: cps_net_ip
- - path: /etc/sysconfig/network-scripts/ifcfg-eth1
- permissions: '0644'
- content:
- str_replace:
- template:
- get_artifact:
- - SELF
- - nimbus-ethernet-gw
- params:
- $dev: eth1
- $netmask:
- get_input: oam_net_mask
- $gateway:
- get_input: oam_net_gw
- $ip:
- get_input: oam_net_ip
- name:
- get_input: fsb1-name
- artifacts:
- nimbus-ethernet-gw:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet-gw
- nimbus-ethernet:
- type: tosca.artifacts.Deployment
- file: ../Artifacts/nimbus-ethernet
- groups:
- ep-jsa_net:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/ep-jsa_net.yaml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - nova_local_type_pcm1
- - nova_local_type_pcm2
- - nova_local_type_pcrf_psm
- - nova_global_type1
- - nova_global_type2 \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml
new file mode 100644
index 0000000000..03ce9d1243
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<!-- only one line, shut up logback ! -->
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>
+ %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
+ </Pattern>
+ </encoder>
+ </appender>
+ <root level="off">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration> \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..2e5d468b31
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/ComputeGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,1202 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ComputeGlobalTypes
+ template_version: 1.0.0
+description: Compute TOSCA Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.Compute:
+ derived_from: tosca.nodes.Compute
+ capabilities:
+ disk.ephemeral.size:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: GB
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.ephemeral.size
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Size of ephemeral disk
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ instance:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: instance
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: instance
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Existence of instance
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ memory:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: MB
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: memory
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Volume of RAM allocated to the instance
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.iops:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: count/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.iops
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average disk iops
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.device.read.requests:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: request
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.read.requests
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of read requests
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ cpu.delta:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: ns
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: cpu.delta
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: CPU time used since previous datapoint
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Delta
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.capacity:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.capacity
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: The amount of disk that the instance can see
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.device.read.bytes:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.read.bytes
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Volume of reads
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.write.bytes:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.write.bytes
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Volume of writes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.latency:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: ms
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.latency
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average disk latency
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.device.read.bytes.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.read.bytes.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of reads
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.usage:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.usage
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: The physical size in bytes of the image container on the host
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ cpu_util:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: '%'
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: cpu_util
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average CPU utilization
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.device.allocation:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.allocation
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: The amount of disk per device occupied by the instance on the host machine
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.write.requests.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: request/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.write.requests.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of write requests
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.write.bytes.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.write.bytes.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of writes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.device.latency:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: ms
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.latency
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average disk latency per device
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ cpu:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: ns
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: cpu
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: CPU time used
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.device.write.requests:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: request
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.write.requests
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of write requests
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.device.write.bytes:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.write.bytes
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Volume of writes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.read.requests:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: request
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.read.requests
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of read requests
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.root.size:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: GB
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.root.size
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Size of root disk
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.device.write.bytes.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.write.bytes.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of writes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ vcpus:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: vcpu
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: vcpus
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of virtual CPUs allocated to the instance
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.device.iops:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: count/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.iops
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average disk iops per device
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.device.usage:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.usage
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: The physical size in bytes of the image container on the host per device
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.device.read.requests.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: request/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.read.requests.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of read requests
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.device.write.requests.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: request/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.write.requests.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of write requests
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.allocation:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.allocation
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: The amount of disk occupied by the instance on the host machine
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ disk.read.bytes.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.read.bytes.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of reads
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.read.bytes:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.read.bytes
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Volume of reads
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ memory.usage:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: MB
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: memory.usage
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Volume of RAM used by the instance from the amount of its allocated memory
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.device.capacity:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.device.capacity
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: The amount of disk per device that the instance can see
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: disk
+ status: SUPPORTED
+ memory.resident:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: MB
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: memory.resident
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Volume of RAM used by the instance on the physical machine
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED
+ disk.write.requests:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: request
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: disk.write.requests
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of write requests
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: compute
+ status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/OnlyComponentsST.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/MainServiceTemplate.yaml
index 54f39e4219..c5c552143b 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/OnlyComponentsST.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/MainServiceTemplate.yaml
@@ -2,23 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
metadata:
template_name: Main
imports:
- NeutronPortGlobalTypes:
+- NeutronPortGlobalTypes:
file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
+- NeutronNetGlobalTypes:
file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
+- CommonGlobalTypes:
file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
+- CinderVolumeGlobalTypes:
file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
+- ContrailNetworkRuleGlobalType:
file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
+- NeutronSecurityRulesGlobalTypes:
file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
+- NovaServerGlobalTypes:
file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
+- ContrailVirtualNetworkGlobalType:
file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
+- AbstractSubstituteGlobalTypes:
file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
node_types:
org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
@@ -245,7 +245,7 @@ topology_template:
get_input: availabilityzone_name
image:
get_input: pcm_image_name
- config_drive: 'True'
+ config_drive: true
user_data_format: RAW
name:
get_input: pcm_server_name
@@ -259,7 +259,7 @@ topology_template:
get_input: availabilityzone_name
image:
get_input: pcm_image_name
- config_drive: 'True'
+ config_drive: true
user_data_format: RAW
name:
get_input: pcm_server_name
@@ -273,7 +273,7 @@ topology_template:
get_input: availabilityzone_name
image:
get_input: pcm_image_name
- config_drive: 'True'
+ config_drive: true
user_data_format: RAW
name:
get_input: pcm_server_name
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..bbaa13873e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/expectedOutput/PortGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,284 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: PortGlobalTypes
+ template_version: 1.0.0
+description: Port TOSCA Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.cp.nodes.network.Port:
+ derived_from: tosca.nodes.network.Port
+ capabilities:
+ network.incoming.packets.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: packet/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.incoming.packets.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of incoming packets
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED
+ network.outgoing.bytes:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.outgoing.bytes
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of outgoing bytes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED
+ network.outgoing.packets.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: packet/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.outgoing.packets.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of outgoing packets
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED
+ network.outpoing.packets:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: packet
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.outpoing.packets
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of outgoing packets
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED
+ network.incoming.bytes.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.incoming.bytes.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of incoming bytes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED
+ network.incoming.bytes:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.incoming.bytes
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of incoming bytes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED
+ network.outgoing.bytes.rate:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: B/s
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.outgoing.bytes.rate
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Average rate of outgoing bytes
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Gauge
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED
+ network.incoming.packets:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ default: packet
+ status: SUPPORTED
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ default: network.incoming.packets
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ default: Number of incoming packets
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ default: Cumulative
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ default: network
+ status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/OnlyComponentsST_01.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/input/MainServiceTemplate.yaml
index 54f39e4219..c5c552143b 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/onlyComponents/OnlyComponentsST_01.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/enrich/input/MainServiceTemplate.yaml
@@ -2,23 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
metadata:
template_name: Main
imports:
- NeutronPortGlobalTypes:
+- NeutronPortGlobalTypes:
file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
+- NeutronNetGlobalTypes:
file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
+- CommonGlobalTypes:
file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
+- CinderVolumeGlobalTypes:
file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
+- ContrailNetworkRuleGlobalType:
file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
+- NeutronSecurityRulesGlobalTypes:
file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
+- NovaServerGlobalTypes:
file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
+- ContrailVirtualNetworkGlobalType:
file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
+- AbstractSubstituteGlobalTypes:
file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
node_types:
org.openecomp.resource.vfc.nodes.heat.pcrf_psm:
@@ -245,7 +245,7 @@ topology_template:
get_input: availabilityzone_name
image:
get_input: pcm_image_name
- config_drive: 'True'
+ config_drive: true
user_data_format: RAW
name:
get_input: pcm_server_name
@@ -259,7 +259,7 @@ topology_template:
get_input: availabilityzone_name
image:
get_input: pcm_image_name
- config_drive: 'True'
+ config_drive: true
user_data_format: RAW
name:
get_input: pcm_server_name
@@ -273,7 +273,7 @@ topology_template:
get_input: availabilityzone_name
image:
get_input: pcm_image_name
- config_drive: 'True'
+ config_drive: true
user_data_format: RAW
name:
get_input: pcm_server_name
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
index 8813b0abf6..224e9b746e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml
@@ -4,7 +4,7 @@ metadata:
template_version: 1.0.0
description: Abstract Substitute Global Types
imports:
- common_definitions:
+- common_definitions:
file: CommonGlobalTypesServiceTemplate.yaml
data_types:
org.openecomp.datatypes.heat.substitution.SubstitutionFilter:
@@ -30,6 +30,47 @@ data_types:
required: false
default: 1
status: SUPPORTED
+ scaling_enabled:
+ type: boolean
+ description: Indicates whether service scaling is enabled
+ required: false
+ default: true
+ status: SUPPORTED
+ mandatory:
+ type: boolean
+ description: Mandatory
+ required: false
+ default: true
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
+ derived_from: tosca.datatypes.Root
+ description: Substitution Filter
+ properties:
+ substitute_service_template:
+ type: string
+ description: Substitute Service Template
+ required: true
+ status: SUPPORTED
+ index_value:
+ type: integer
+ description: Index value of the substitution service template runtime instance
+ required: false
+ default: 0
+ status: SUPPORTED
+ constraints:
+ - greater_or_equal: 0
+ count:
+ type: string
+ description: Count
+ required: false
+ default: 1
+ status: SUPPORTED
+ scaling_enabled:
+ type: boolean
+ description: Indicates whether service scaling is enabled
+ required: false
+ default: true
+ status: SUPPORTED
mandatory:
type: boolean
description: Mandatory
@@ -41,7 +82,7 @@ node_types:
derived_from: tosca.nodes.Root
properties:
service_template_filter:
- type: org.openecomp.datatypes.heat.substitution.SubstitutionFilter
+ type: org.openecomp.datatypes.heat.substitution.SubstitutionFiltering
description: Substitution Filter
required: true
status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
index 3ef94f22e7..c72ecd31df 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml
@@ -4,7 +4,7 @@ metadata:
template_version: 1.0.0
description: Cinder Volume TOSCA Global Types
relationship_types:
- org.openecomp.relationships.heat.cinder.VolumeAttachesTo:
+ org.openecomp.relationships.VolumeAttachesTo:
derived_from: tosca.relationships.AttachesTo
description: This type represents an attachment relationship for associating volume
properties:
@@ -166,6 +166,8 @@ node_types:
type: map
description: Key/value pairs associated with the volume in raw dict form
status: SUPPORTED
+ entry_schema:
+ type: string
bootable:
type: boolean
description: Boolean indicating if the volume can be booted or not
@@ -173,4 +175,4 @@ node_types:
status:
type: string
description: The current status of the volume
- status: SUPPORTED
+ status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
index 3388d5a89b..eee8a96129 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml
@@ -4,7 +4,7 @@ metadata:
template_version: 1.0.0
description: TOSCA Global Types
imports:
- NativeTypesServiceTemplate:
+- NativeTypesServiceTemplate:
file: NativeTypesServiceTemplateServiceTemplate.yaml
data_types:
org.openecomp.datatypes.heat.network.AddressPair:
@@ -21,6 +21,25 @@ data_types:
description: IP address
required: false
status: SUPPORTED
+ org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
+ derived_from: tosca.datatypes.Root
+ description: static route
+ properties:
+ prefix:
+ type: string
+ description: Route prefix
+ required: false
+ status: SUPPORTED
+ next_hop:
+ type: string
+ description: Next hop
+ required: false
+ status: SUPPORTED
+ next_hop_type:
+ type: string
+ description: Next hop type
+ required: false
+ status: SUPPORTED
org.openecomp.datatypes.heat.network.subnet.HostRoute:
derived_from: tosca.datatypes.Root
description: Host route info for the subnet
@@ -153,6 +172,86 @@ data_types:
description: End address for the allocation pool
required: false
status: SUPPORTED
+ org.openecomp.datatypes.heat.network.contrail.AddressPair:
+ derived_from: tosca.datatypes.Root
+ description: Address Pair
+ properties:
+ address_mode:
+ type: string
+ description: Address mode active-active or active-standy
+ required: false
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - active-active
+ - active-standby
+ prefix:
+ type: string
+ description: IP address prefix
+ required: false
+ status: SUPPORTED
+ mac_address:
+ type: string
+ description: Mac address
+ required: false
+ status: SUPPORTED
+capability_types:
+ org.openecomp.capabilities.Metric:
+ derived_from: tosca.capabilities.nfv.Metric
+ description: A node type that includes the Metric capability indicates that it can be monitored.
+ properties:
+ unit:
+ type: string
+ description: Unit of the metric value
+ required: true
+ status: SUPPORTED
+ description:
+ type: string
+ description: Description of the metric
+ required: false
+ status: SUPPORTED
+ type:
+ type: string
+ description: Type of the metric value, for an example, Cumulative, Delta, Gauge and etc.
+ required: true
+ status: SUPPORTED
+ category:
+ type: string
+ description: Category of the metric, for an example, compute, disk, network, storage and etc.
+ required: false
+ status: SUPPORTED
+ attributes:
+ value:
+ type: string
+ description: Runtime monitored value
+ status: SUPPORTED
+ org.openecomp.capabilities.metric.Ceilometer:
+ derived_from: org.openecomp.capabilities.Metric
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ properties:
+ name:
+ type: string
+ description: Ceilometer metric type name to monitor. (The name ceilometer is using)
+ required: true
+ status: SUPPORTED
+ org.openecomp.capabilities.metric.SnmpPolling:
+ derived_from: org.openecomp.capabilities.Metric
+ description: A node type that includes the Metric capability indicates that it can be monitored using snmp polling.
+ properties:
+ oid:
+ type: string
+ description: Object Id of the metric
+ required: true
+ status: SUPPORTED
+ org.openecomp.capabilities.metric.SnmpTrap:
+ derived_from: org.openecomp.capabilities.Metric
+ description: A node type that includes the Metric capability indicates that it can be monitored using snmp trap.
+ properties:
+ oid:
+ type: string
+ description: Object Id of the metric
+ required: true
+ status: SUPPORTED
relationship_types:
org.openecomp.relationships.AttachesTo:
derived_from: tosca.relationships.Root
@@ -173,6 +272,48 @@ group_types:
required: false
status: SUPPORTED
policy_types:
+ org.openecomp.policies.placement.valet.Diversity:
+ derived_from: tosca.policy.placement
+ description: Valet Diversity
+ properties:
+ level:
+ type: string
+ description: diversity
+ required: false
+ default: host
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - host
+ - rack
+ org.openecomp.policies.placement.valet.Exclusivity:
+ derived_from: tosca.policy.placement
+ description: Valet Exclusivity
+ properties:
+ level:
+ type: string
+ description: exclusivity
+ required: false
+ default: host
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - host
+ - rack
+ org.openecomp.policies.placement.valet.Affinity:
+ derived_from: tosca.policy.placement
+ description: Valet Affinity
+ properties:
+ level:
+ type: string
+ description: affinity
+ required: false
+ default: host
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - host
+ - rack
org.openecomp.policies.placement.Colocate:
derived_from: tosca.policy.placement
description: Keep associated nodes (groups of nodes) based upon affinity value
@@ -210,4 +351,4 @@ policy_types:
- valid_values:
- host
- region
- - compute
+ - compute \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ComputeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ComputeGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..19f5cbf25a
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ComputeGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,11 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ComputeGlobalTypes
+ template_version: 1.0.0
+description: Compute TOSCA Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.Compute:
+ derived_from: tosca.nodes.Compute \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..e667df0742
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailAbstractSubstituteGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,166 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ContrailAbstractSubstituteGlobalTypes
+ template_version: 1.0.0
+description: Contrail Abstract Substitute Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+data_types:
+ org.openecomp.datatypes.heat.network.contrail.InterfaceData:
+ derived_from: tosca.datatypes.Root
+ description: Interface Data
+ properties:
+ static_routes:
+ type: list
+ description: An ordered list of static routes to be added to this interface
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
+ virtual_network:
+ type: string
+ description: Virtual Network for this interface
+ required: true
+ status: SUPPORTED
+ allowed_address_pairs:
+ type: list
+ description: List of allowed address pair for this interface
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.contrail.AddressPair
+ ip_address:
+ type: string
+ description: IP for this interface
+ required: false
+ status: SUPPORTED
+node_types:
+ org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute:
+ derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
+ properties:
+ availability_zone:
+ type: string
+ description: Availability zone to create servers in
+ required: false
+ status: SUPPORTED
+ static_routes_list:
+ type: list
+ description: Static routes enabled
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: boolean
+ availability_zone_enable:
+ type: boolean
+ description: Indicates availability zone is enabled
+ required: false
+ default: false
+ status: SUPPORTED
+ service_template_name:
+ type: string
+ description: Service template name
+ required: false
+ status: SUPPORTED
+ ordered_interfaces:
+ type: boolean
+ description: Indicates if service interface are ordered
+ required: false
+ default: false
+ status: SUPPORTED
+ flavor:
+ type: string
+ description: flavor
+ required: false
+ status: SUPPORTED
+ image_name:
+ type: string
+ description: Image name
+ required: true
+ status: SUPPORTED
+ service_type:
+ type: string
+ description: Service type
+ required: true
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - firewall
+ - analyzer
+ - source-nat
+ - loadbalancer
+ service_interface_type_list:
+ type: list
+ description: List of interface types
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ constraints:
+ - valid_values:
+ - management
+ - left
+ - right
+ - other
+ service_instance_name:
+ type: string
+ description: Service instance name
+ required: true
+ status: SUPPORTED
+ interface_list:
+ type: list
+ description: List of interfaces
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.contrail.InterfaceData
+ service_mode:
+ type: string
+ description: Service mode
+ required: true
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - transparent
+ - in-network
+ - in-network-nat
+ shared_ip_list:
+ type: list
+ description: Shared ips enabled
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: boolean
+ attributes:
+ tenant_id:
+ type: string
+ description: Tenant id of the Service Instance
+ status: SUPPORTED
+ fq_name:
+ type: string
+ description: The FQ name of the service instance
+ status: SUPPORTED
+ service_template_name:
+ type: string
+ description: Service Template of the Service Instance
+ status: SUPPORTED
+ show:
+ type: string
+ description: All attributes
+ status: SUPPORTED
+ active_vms:
+ type: string
+ description: Number of service VMs active for this Service Instance
+ status: SUPPORTED
+ service_instance_name:
+ type: string
+ description: The name of the service instance
+ status: SUPPORTED
+ virtual_machines:
+ type: string
+ description: Service VMs for the Service Instance
+ status: SUPPORTED
+ status:
+ type: string
+ description: Status of the service instance
+ status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..dff50856cd
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailComputeGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,91 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ContrailComputeGlobalTypes
+ template_version: 1.0.0
+description: Contrail Compute TOSCA Global Types
+imports:
+- ComputeGlobalTypes:
+ file: ComputeGlobalTypesServiceTemplate.yaml
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vfc.nodes.heat.contrail.Compute:
+ derived_from: org.openecomp.resource.vfc.nodes.Compute
+ properties:
+ flavor:
+ type: string
+ description: flavor
+ required: false
+ status: SUPPORTED
+ image_name:
+ type: string
+ description: Image name
+ required: true
+ status: SUPPORTED
+ availability_zone:
+ type: string
+ description: Availability zone to create servers in
+ required: false
+ status: SUPPORTED
+ service_type:
+ type: string
+ description: Service type
+ required: true
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - firewall
+ - analyzer
+ - source-nat
+ - loadbalancer
+ availability_zone_enable:
+ type: boolean
+ description: Indicates availability zone is enabled
+ required: false
+ default: false
+ status: SUPPORTED
+ service_template_name:
+ type: string
+ description: Service template name
+ required: false
+ status: SUPPORTED
+ service_instance_name:
+ type: string
+ description: Service instance name
+ required: true
+ status: SUPPORTED
+ service_mode:
+ type: string
+ description: Service mode
+ required: true
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - transparent
+ - in-network
+ - in-network-nat
+ attributes:
+ tenant_id:
+ type: string
+ description: Tenant id of the VM
+ status: SUPPORTED
+ fq_name:
+ type: string
+ description: fq_name
+ status: SUPPORTED
+ show:
+ type: string
+ description: All attributes
+ status: SUPPORTED
+ active_vms:
+ type: string
+ description: Number of active VMs
+ status: SUPPORTED
+ virtual_machines:
+ type: string
+ description: VMs of this compute
+ status: SUPPORTED
+ status:
+ type: string
+ description: status of the compute
+ status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
index 98317310fa..8038479153 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
@@ -4,7 +4,7 @@ metadata:
template_version: 1.0.0
description: Contrail Network Rule Global Types
imports:
- common_definitions:
+- common_definitions:
file: CommonGlobalTypesServiceTemplate.yaml
data_types:
org.openecomp.datatypes.heat.contrail.network.rule.PortPairs:
@@ -89,7 +89,7 @@ data_types:
required: false
status: SUPPORTED
node_types:
- org.openecomp.resource.nodes.heat.network.contrail.NetworkRules:
+ org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules:
derived_from: tosca.nodes.Root
properties:
entries:
@@ -103,10 +103,24 @@ node_types:
required: false
status: SUPPORTED
attributes:
+ tenant_id:
+ type: string
+ description: tenant_id
+ status: SUPPORTED
fq_name:
type: string
description: fq_name
status: SUPPORTED
+ show:
+ type: string
+ description: All attributes.
+ status: SUPPORTED
+ rules:
+ type: list
+ description: List of rules
+ status: SUPPORTED
+ entry_schema:
+ type: string
requirements:
- network:
capability: tosca.capabilities.Attachment
@@ -114,4 +128,4 @@ node_types:
relationship: org.openecomp.relationships.AttachesTo
occurrences:
- 0
- - UNBOUNDED
+ - UNBOUNDED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..06857ed1dd
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailPortGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,66 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ContrailPortGlobalTypes
+ template_version: 1.0.0
+description: Contrail Port TOSCA Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+- PortGlobalTypes:
+ file: PortGlobalTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.cp.nodes.heat.network.contrail.Port:
+ derived_from: org.openecomp.resource.cp.nodes.network.Port
+ properties:
+ static_routes:
+ type: list
+ description: An ordered list of static routes to be added to this interface
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
+ virtual_network:
+ type: string
+ description: Virtual Network for this interface
+ required: true
+ status: SUPPORTED
+ static_route:
+ type: boolean
+ description: Static route enabled
+ required: false
+ default: false
+ status: SUPPORTED
+ allowed_address_pairs:
+ type: list
+ description: List of allowed address pair for this interface
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.contrail.AddressPair
+ shared_ip:
+ type: boolean
+ description: Shared ip enabled
+ required: false
+ default: false
+ status: SUPPORTED
+ ip_address:
+ type: string
+ description: IP for this interface
+ required: false
+ status: SUPPORTED
+ interface_type:
+ type: string
+ description: Interface type
+ required: true
+ status: SUPPORTED
+ constraints:
+ - valid_values:
+ - management
+ - left
+ - right
+ - other
+ attributes:
+ fq_name:
+ type: string
+ description: fq_name
+ status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml
new file mode 100644
index 0000000000..11e29bde76
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2NetworkRuleGlobalTypeServiceTemplate.yaml
@@ -0,0 +1,156 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ContrailV2NetworkRuleGlobalType
+ template_version: 1.0.0
+description: Contrail V2 Network Rule Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+data_types:
+ org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
+ derived_from: tosca.datatypes.Root
+ description: source addresses
+ properties:
+ network_policy_entries_policy_rule_src_addresses_virtual_network:
+ type: string
+ description: Source addresses Virtual network
+ required: false
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
+ derived_from: tosca.datatypes.Root
+ description: destination addresses
+ properties:
+ network_policy_entries_policy_rule_dst_addresses_virtual_network:
+ type: string
+ description: Destination addresses Virtual network
+ required: false
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
+ derived_from: tosca.datatypes.Root
+ description: policy rule
+ properties:
+ network_policy_entries_policy_rule_dst_addresses:
+ type: list
+ description: Destination addresses
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork
+ network_policy_entries_policy_rule_dst_ports:
+ type: list
+ description: Destination ports
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs
+ network_policy_entries_policy_rule_protocol:
+ type: string
+ description: Protocol
+ required: false
+ status: SUPPORTED
+ network_policy_entries_policy_rule_src_addresses:
+ type: list
+ description: Source addresses
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork
+ network_policy_entries_policy_rule_direction:
+ type: string
+ description: Direction
+ required: false
+ status: SUPPORTED
+ network_policy_entries_policy_rule_src_ports:
+ type: list
+ description: Source ports
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs
+ network_policy_entries_policy_rule_action_list:
+ type: org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList
+ description: Action list
+ required: false
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
+ derived_from: tosca.datatypes.Root
+ description: Action List
+ properties:
+ network_policy_entries_policy_rule_action_list_simple_action:
+ type: string
+ description: Simple Action
+ required: false
+ status: SUPPORTED
+ network_policy_entries_policy_rule_action_list_apply_service:
+ type: list
+ description: Apply Service
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
+ derived_from: tosca.datatypes.Root
+ description: list of policy rules
+ properties:
+ network_policy_entries_policy_rule:
+ type: list
+ description: Contrail network rule
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
+ org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
+ derived_from: tosca.datatypes.Root
+ description: destination port pairs
+ properties:
+ network_policy_entries_policy_rule_dst_ports_start_port:
+ type: string
+ description: Start port
+ required: false
+ status: SUPPORTED
+ network_policy_entries_policy_rule_dst_ports_end_port:
+ type: string
+ description: End port
+ required: false
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs:
+ derived_from: tosca.datatypes.Root
+ description: source port pairs
+ properties:
+ network_policy_entries_policy_rule_src_ports_start_port:
+ type: string
+ description: Start port
+ required: false
+ status: SUPPORTED
+ network_policy_entries_policy_rule_src_ports_end_port:
+ type: string
+ description: End port
+ required: false
+ status: SUPPORTED
+node_types:
+ org.openecomp.resource.vfc.rules.nodes.heat.network.contrailV2.NetworkRules:
+ derived_from: tosca.nodes.Root
+ properties:
+ name:
+ type: string
+ description: A symbolic name for this contrail v2 network rule
+ required: false
+ status: SUPPORTED
+ network_policy_entries:
+ type: org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList
+ description: A symbolic name for this contrail v2 network rule
+ required: false
+ status: SUPPORTED
+ attributes:
+ fq_name:
+ type: string
+ description: fq_name
+ status: SUPPORTED
+ requirements:
+ - network:
+ capability: tosca.capabilities.Attachment
+ node: tosca.nodes.network.Network
+ relationship: org.openecomp.relationships.AttachesTo
+ occurrences:
+ - 0
+ - UNBOUNDED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
new file mode 100644
index 0000000000..61c3af6e82
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualMachineInterfaceGlobalTypeServiceTemplate.yaml
@@ -0,0 +1,71 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ContrailV2VirtualMachineInterfaceGlobalType
+ template_version: 1.0.0
+description: Contrail Virtual Machine Interface TOSCA Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+- PortGlobalTypes:
+ file: PortGlobalTypesServiceTemplate.yaml
+data_types:
+ org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
+ derived_from: tosca.datatypes.Root
+ description: Virtual Machine Interface Properties.
+ properties:
+ virtual_machine_interface_properties_service_interface_type:
+ type: string
+ description: Service Interface Type.
+ required: false
+ status: SUPPORTED
+node_types:
+ org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface:
+ derived_from: org.openecomp.resource.cp.nodes.network.Port
+ properties:
+ virtual_machine_intefrace_mac_addresses:
+ type: list
+ description: List of mac addresses.
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ name:
+ type: string
+ description: Virtual Machine Interface name
+ required: false
+ status: SUPPORTED
+ security_group_refs:
+ type: list
+ description: List of security groups.
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ virtual_network_refs:
+ type: list
+ description: List of virtual networks.
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ virtual_machine_interface_properties:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
+ description: virtual machine interface properties.
+ required: false
+ status: SUPPORTED
+ port_tuple_refs:
+ type: list
+ description: List of port tuples.
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ attributes:
+ fq_name:
+ type: string
+ description: The FQ name of the Virtual Network.
+ status: SUPPORTED
+ show:
+ type: string
+ description: All attributes.
+ status: SUPPORTED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml
new file mode 100644
index 0000000000..dcf36dbafa
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailV2VirtualNetworkGlobalTypeServiceTemplate.yaml
@@ -0,0 +1,141 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: ContrailV2VirtualNetworkGlobalType
+ template_version: 1.0.0
+description: Contrail V2 Virtual Network Global Types
+imports:
+- NetworkGlobalTypes:
+ file: NetworkGlobalTypesServiceTemplate.yaml
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+data_types:
+ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
+ derived_from: tosca.datatypes.Root
+ description: network policy refs data
+ properties:
+ network_policy_refs_data_sequence:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence
+ description: Network Policy ref data sequence
+ required: false
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
+ derived_from: tosca.datatypes.Root
+ description: network policy refs data sequence
+ properties:
+ network_policy_refs_data_sequence_major:
+ type: integer
+ description: Network Policy ref data sequence Major
+ required: false
+ status: SUPPORTED
+ network_policy_refs_data_sequence_minor:
+ type: integer
+ description: Network Policy ref data sequence Minor
+ required: false
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet:
+ derived_from: tosca.datatypes.Root
+ description: Network Ipam Ref Data Subnet
+ properties:
+ network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
+ type: string
+ description: Network ipam refs data ipam subnets ip prefix len
+ required: false
+ status: SUPPORTED
+ network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
+ type: string
+ description: Network ipam refs data ipam subnets ip prefix
+ required: false
+ status: SUPPORTED
+ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData:
+ derived_from: tosca.datatypes.Root
+ description: Network Ipam Ref Data
+ properties:
+ network_ipam_refs_data_ipam_subnets:
+ type: list
+ description: Network ipam refs data ipam subnets
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList
+ org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList:
+ derived_from: tosca.datatypes.Root
+ description: Network Ipam Ref Data Subnet List
+ properties:
+ network_ipam_refs_data_ipam_subnets_subnet:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
+ description: Network ipam refs data ipam subnets
+ required: false
+ status: SUPPORTED
+ network_ipam_refs_data_ipam_subnets_addr_from_start:
+ type: string
+ description: Network ipam refs data ipam subnets addr from start
+ required: false
+ status: SUPPORTED
+node_types:
+ org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork:
+ derived_from: org.openecomp.resource.vl.nodes.network.Network
+ properties:
+ network_ipam_refs_data:
+ type: list
+ description: IPAM references Data
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData
+ network_policy_refs_data:
+ type: list
+ description: Policy references data
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData
+ network_ipam_refs:
+ type: list
+ description: IPAM references
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ network_policy_refs:
+ type: list
+ description: Policy references
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ subnets:
+ type: map
+ description: Network related subnets
+ required: false
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.neutron.Subnet
+ attributes:
+ fq_name:
+ type: string
+ description: fq_name
+ status: SUPPORTED
+ subnets_name:
+ type: list
+ description: Subnets name of this network
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ subnets_show:
+ type: map
+ description: Detailed information about each subnet
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ subnets:
+ type: map
+ description: Network related subnets
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.heat.network.neutron.Subnet
+ capabilities:
+ attachment:
+ type: tosca.capabilities.Attachment
+ occurrences:
+ - 1
+ - UNBOUNDED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
index 0927e3dd0e..5583c68278 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
@@ -4,11 +4,13 @@ metadata:
template_version: 1.0.0
description: Contrail Virtual Network Global Types
imports:
- common_definitions:
+- NetworkGlobalTypes:
+ file: NetworkGlobalTypesServiceTemplate.yaml
+- common_definitions:
file: CommonGlobalTypesServiceTemplate.yaml
node_types:
org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork:
- derived_from: tosca.nodes.network.Network
+ derived_from: org.openecomp.resource.vl.nodes.network.Network
properties:
shared:
type: string
@@ -25,6 +27,11 @@ node_types:
description: Is virtual network external
required: false
status: SUPPORTED
+ allow_transit:
+ type: string
+ description: Whether this network should be transitive.
+ required: false
+ status: SUPPORTED
flood_unknown_unicast:
type: string
description: flood L2 packets on network
@@ -45,6 +52,14 @@ node_types:
entry_schema:
type: org.openecomp.datatypes.heat.network.neutron.Subnet
attributes:
+ fq_name:
+ type: string
+ description: fq_name
+ status: SUPPORTED
+ show:
+ type: string
+ description: All attributes.
+ status: SUPPORTED
subnets_name:
type: list
description: Subnets name of this network
@@ -68,4 +83,4 @@ node_types:
type: tosca.capabilities.Attachment
occurrences:
- 1
- - UNBOUNDED
+ - UNBOUNDED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml
index 08c47bc646..1ce3fc54ff 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -2,23 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
metadata:
template_name: GlobalSubstitutionTypes
imports:
- NeutronPortGlobalTypes:
+- NeutronPortGlobalTypes:
file: NeutronPortGlobalTypesServiceTemplate.yaml
- NeutronNetGlobalTypes:
+- NeutronNetGlobalTypes:
file: NeutronNetGlobalTypesServiceTemplate.yaml
- CommonGlobalTypes:
+- CommonGlobalTypes:
file: CommonGlobalTypesServiceTemplate.yaml
- CinderVolumeGlobalTypes:
+- CinderVolumeGlobalTypes:
file: CinderVolumeGlobalTypesServiceTemplate.yaml
- ContrailNetworkRuleGlobalType:
+- ContrailNetworkRuleGlobalType:
file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml
- NeutronSecurityRulesGlobalTypes:
+- NeutronSecurityRulesGlobalTypes:
file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
- NovaServerGlobalTypes:
+- NovaServerGlobalTypes:
file: NovaServerGlobalTypesServiceTemplate.yaml
- ContrailVirtualNetworkGlobalType:
+- ContrailVirtualNetworkGlobalType:
file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml
- AbstractSubstituteGlobalTypes:
+- AbstractSubstituteGlobalTypes:
file: AbstractSubstituteGlobalTypesServiceTemplate.yaml
node_types:
org.openecomp.resource.abstract.nodes.heat.nested:
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
index e7dfd49ed9..ffadfc5af5 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml
@@ -3,6 +3,9 @@ metadata:
template_name: NativeTypesServiceTemplate
template_version: 1.0.0
description: TOSCA Native Node Types
+capability_types:
+ tosca.capabilities.nfv.Metric:
+ derived_from: tosca.capabilities.Root
node_types:
tosca.nodes.Compute:
derived_from: tosca.nodes.Root
@@ -95,10 +98,16 @@ node_types:
capability: tosca.capabilities.network.Linkable
node: tosca.nodes.Root
relationship: tosca.relationships.network.LinksTo
+ occurrences:
+ - 1
+ - 1
- binding:
capability: tosca.capabilities.network.Bindable
node: tosca.nodes.Root
relationship: tosca.relationships.network.BindsTo
+ occurrences:
+ - 1
+ - 1
tosca.nodes.Root:
attributes:
tosca_name:
@@ -122,6 +131,11 @@ node_types:
type: string
required: false
status: SUPPORTED
+ dhcp_enabled:
+ type: boolean
+ required: false
+ default: true
+ status: SUPPORTED
segmentation_id:
type: string
required: false
@@ -191,4 +205,4 @@ node_types:
type: tosca.capabilities.Attachment
occurrences:
- 1
- - UNBOUNDED
+ - UNBOUNDED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NetworkGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NetworkGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..a3ae39ac1c
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NetworkGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,11 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: NetworkGlobalTypes
+ template_version: 1.0.0
+description: Network TOSCA Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.vl.nodes.network.Network:
+ derived_from: tosca.nodes.network.Network \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
index e80e2727c7..3dbb24b0f2 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml
@@ -4,11 +4,13 @@ metadata:
template_version: 1.0.0
description: Neutron Network TOSCA Global Types
imports:
- common_definitions:
+- NetworkGlobalTypes:
+ file: NetworkGlobalTypesServiceTemplate.yaml
+- common_definitions:
file: CommonGlobalTypesServiceTemplate.yaml
node_types:
org.openecomp.resource.vl.nodes.heat.network.neutron.Net:
- derived_from: tosca.nodes.network.Network
+ derived_from: org.openecomp.resource.vl.nodes.network.Network
properties:
dhcp_agent_ids:
type: list
@@ -94,4 +96,4 @@ node_types:
type: tosca.capabilities.Attachment
occurrences:
- 1
- - UNBOUNDED
+ - UNBOUNDED \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
index a337d6ed18..4613b70f74 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml
@@ -4,8 +4,10 @@ metadata:
template_version: 1.0.0
description: Neutron Port TOSCA Global Types
imports:
- common_definitions:
+- common_definitions:
file: CommonGlobalTypesServiceTemplate.yaml
+- PortGlobalTypes:
+ file: PortGlobalTypesServiceTemplate.yaml
data_types:
org.openecomp.datatypes.heat.neutron.port.FixedIps:
derived_from: tosca.datatypes.Root
@@ -23,7 +25,7 @@ data_types:
status: SUPPORTED
node_types:
org.openecomp.resource.cp.nodes.heat.network.neutron.Port:
- derived_from: tosca.nodes.network.Port
+ derived_from: org.openecomp.resource.cp.nodes.network.Port
properties:
port_security_enabled:
type: boolean
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
index 49c9a102c8..3e4a465689 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml
@@ -4,7 +4,7 @@ metadata:
template_version: 1.0.0
description: Neutron Security Rules TOSCA Global Types
imports:
- common_definitions:
+- common_definitions:
file: CommonGlobalTypesServiceTemplate.yaml
data_types:
org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
@@ -81,17 +81,17 @@ data_types:
- 0
- 65535
node_types:
- org.openecomp.resource.nodes.heat.network.neutron.SecurityRules:
+ org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules:
derived_from: tosca.nodes.Root
properties:
- description:
+ name:
type: string
- description: Description of the security group
+ description: A symbolic name for this security group, which is not required to be unique.
required: false
status: SUPPORTED
- name:
+ description:
type: string
- description: A symbolic name for this security group, which is not required to be unique.
+ description: Description of the security group
required: false
status: SUPPORTED
rules:
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
index 2253a1e4af..2a7069a932 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml
@@ -4,7 +4,9 @@ metadata:
template_version: 1.0.0
description: Nova Server TOSCA Global Types
imports:
- common_definitions:
+- ComputeGlobalTypes:
+ file: ComputeGlobalTypesServiceTemplate.yaml
+- common_definitions:
file: CommonGlobalTypesServiceTemplate.yaml
data_types:
org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
@@ -69,7 +71,7 @@ data_types:
status: SUPPORTED
node_types:
org.openecomp.resource.vfc.nodes.heat.nova.Server:
- derived_from: tosca.nodes.Compute
+ derived_from: org.openecomp.resource.vfc.nodes.Compute
properties:
admin_pass:
type: string
@@ -98,16 +100,16 @@ node_types:
- REPLACE
- REBUILD
metadata:
- type: map
- description: Arbitrary key/value metadata to store for this server
+ type: json
+ description: Arbitrary JSON metadata to store for this server
required: false
status: SUPPORTED
- constraints:
- - max_length: 255
- entry_schema:
- type: string
- constraints:
- - max_length: 255
+ contrail_service_instance_ind:
+ type: boolean
+ description: Nova server related to service instance indicator
+ required: false
+ default: false
+ status: SUPPORTED
user_data_update_policy:
type: string
description: Policy on how to apply a user_data update
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/PortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/PortGlobalTypesServiceTemplate.yaml
new file mode 100644
index 0000000000..09a6e33c9e
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-core/src/test/resources/mock/toscaGlobalServiceTemplates/PortGlobalTypesServiceTemplate.yaml
@@ -0,0 +1,11 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+metadata:
+ template_name: PortGlobalTypes
+ template_version: 1.0.0
+description: Port TOSCA Global Types
+imports:
+- common_definitions:
+ file: CommonGlobalTypesServiceTemplate.yaml
+node_types:
+ org.openecomp.resource.cp.nodes.network.Port:
+ derived_from: tosca.nodes.network.Port \ No newline at end of file