- CVFC
- PNF
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/healthCheck
- VFC
- CVFC
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/healthCheck
- CVFC
- PNF
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/monitoring
- /sdc2/rest/healthCheck
import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
import org.openecomp.sdc.common.log.wrappers.Logger;
import org.openecomp.sdc.common.util.YamlToObjectConverter;
+import org.openecomp.sdc.exception.YamlConversionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
* The main method for testing only
* @param args
*/
- public static void main(String[] args) {
+ public static void main(String[] args) throws YamlConversionException {
List<String> servers = new ArrayList<>();
String server = "uebsb91kcdc.it.att.com:3904";
- VFC
- CVFC
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/healthCheck
- VFC
- CVFC
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/healthCheck
validForResourceTypes:
- PNF
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/healthCheck
# request processing timeout (seconds)
requestTimeout: 10
-# a4c hostname
-a4cHost: localhost
-
-# a4c http port
-a4cHttpPort: 8088
-
-
identificationHeaderFields:
-
- &HTTP_IV_USER HTTP_IV_USER
- VFC
- CVFC
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/healthCheck
- VFC
- CVFC
-resourceInformationalDeployedArtifacts:
-
unLoggedUrls:
- /sdc2/rest/healthCheck
password: hmXYcznAljMSisdy8zgcag==
dmeConfiguration:
- dme2Search: DME2SEARCH
- dme2Resolve: DME2RESOLVE
+ lookupUriFormat: "http://DME2RESOLVE/service=%s/version=1.0.0/envContext=%s/routeOffer=DEFAULT"
* ============LICENSE_END=========================================================
*/
-'use strict'
+'use strict';
import {IAppConfigurtaion, IApi} from "../models/app-config";
interface IConfigurationUiService {
private Map<String, ArtifactTypeConfig> serviceDeploymentArtifacts;
private Map<String, ArtifactTypeConfig> resourceInstanceDeploymentArtifacts;
private Map<String, ArtifactTypeConfig> resourceInformationalArtifacts;
- private Map<String, ArtifactTypeConfig> resourceInformationalDeployedArtifacts;
private Map<String, Object> serviceApiArtifacts;
private List<String> excludeServiceCategory;
private CadiFilterParams cadiFilterParams;
private Boolean aafAuthNeeded;
-
private String autoHealingOwner;
private boolean enableAutoHealing;
-
private Map<String, List<String>> resourcesForUpgrade;
private DmaapConsumerConfiguration dmaapConsumerConfiguration;
private DmaapProducerConfiguration dmaapProducerConfiguration;
-
private boolean skipUpgradeFailedVfs;
private boolean skipUpgradeVSPs;
private DmeConfiguration dmeConfiguration;
-
private boolean supportAllottedResourcesAndProxy;
private Integer deleteLockTimeoutInSeconds;
private Integer maxDeleteComponents;
private CookieConfig authCookie;
-
-
private String aafNamespace;
private String workloadContext;
-
private EnvironmentContext environmentContext;
-
+ private List<GabConfig> gabConfig;
+ private EcompPortalConfig ecompPortal;
public String getAutoHealingOwner() {
return autoHealingOwner;
public void setDmaapConsumerConfiguration(DmaapConsumerConfiguration dmaapConsumerConfiguration) {
this.dmaapConsumerConfiguration = dmaapConsumerConfiguration;
}
-
public DmeConfiguration getDmeConfiguration() {
return dmeConfiguration;
}
public void setDmeConfiguration(DmeConfiguration dmeConfiguration) {
this.dmeConfiguration = dmeConfiguration;
}
+
public void setSkipUpgradeVSPs(boolean skipUpgradeVSPs) { this.skipUpgradeVSPs = skipUpgradeVSPs; }
public boolean getSkipUpgradeVSPsFlag() { return skipUpgradeVSPs; }
this.artifactGeneratorConfig = artifactGeneratorConfig;
}
- private List<GabConfig> gabConfig;
-
public Map<String, String> getGenericAssetNodeTypes() {
return genericAssetNodeTypes;
}
this.applicationL2Cache = applicationL2Cache;
}
- private EcompPortalConfig ecompPortal;
-
public CassandrConfig getCassandraConfig() {
return cassandraConfig;
}
private Integer port;
private String healthCheckUri;
private String defaultFunctionalMenu;
+ private Integer pollingInterval;
+ private Integer timeoutMs;
public void setPollingInterval(Integer pollingInterval) {
this.pollingInterval = pollingInterval;
this.timeoutMs = timeoutMs;
}
- private Integer pollingInterval;
- private Integer timeoutMs;
-
public String getProtocol() {
return protocol;
}
this.artifactsIndex = artifactsIndex;
}
- public Map<String, ArtifactTypeConfig> getResourceInformationalDeployedArtifacts() {
- return resourceInformationalDeployedArtifacts;
- }
-
- public void setResourceInformationalDeployedArtifacts(
- Map<String, ArtifactTypeConfig> resourceInformationalDeployedArtifacts) {
- this.resourceInformationalDeployedArtifacts = resourceInformationalDeployedArtifacts;
- }
-
public List<String> getResourceTypes() {
return resourceTypes;
}
ConfigurationSource configurationSource = null;
private static ConfigurationManager instance;
+ final Map<String, Object> configurations = new HashMap<>();
@VisibleForTesting
public ConfigurationManager() {
instance = this;
}
- Map<String, Object> configurations = new HashMap<>();
public ConfigurationManager(ConfigurationSource configurationSource) {
super();
this.configurationSource = configurationSource;
return instance;
}
- public void reconfigure(BasicConfiguration obj) { }
+ public void reconfigure(final BasicConfiguration basicConfiguration) {
+ if (basicConfiguration instanceof Configuration) {
+ configurations.put(getKey(Configuration.class), basicConfiguration);
+ }
+ }
/**
* FOR TEST ONLY
public interface ConfigurationSource {
- public <T> T getAndWatchConfiguration(Class<T> className, ConfigurationListener configurationListener);
+ <T> T getAndWatchConfiguration(Class<T> className, ConfigurationListener configurationListener);
- public <T> void addWatchConfiguration(Class<T> className, ConfigurationListener configurationListener);
+ <T> void addWatchConfiguration(Class<T> className, ConfigurationListener configurationListener);
}
package org.openecomp.sdc.common.api;
+@FunctionalInterface
public interface FileChangeCallback {
- public void reconfigure(BasicConfiguration obj);
+ void reconfigure(BasicConfiguration obj);
}
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2020 Nordix Foundation
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.common.api.exception;
+
+public class LoadConfigurationException extends RuntimeException {
+
+ public LoadConfigurationException(final String s, final Throwable throwable) {
+ super(s, throwable);
+ }
+}
package org.openecomp.sdc.common.impl;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.jci.listeners.FileChangeListener;
import org.openecomp.sdc.common.api.BasicConfiguration;
import org.openecomp.sdc.common.api.ConfigurationListener;
import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
import org.openecomp.sdc.common.util.YamlToObjectConverter;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.openecomp.sdc.exception.YamlConversionException;
public class ConfigFileChangeListener extends FileChangeListener {
- private static Logger log = Logger.getLogger(ConfigFileChangeListener.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(ConfigFileChangeListener.class.getName());
private Map<String, List<ConfigurationListener>> fileChangeToCallBack = new HashMap<>();
@Override
public void onFileChange(File pFile) {
-
super.onFileChange(pFile);
- if (pFile != null) {
-
- if (fileChangeToCallBack != null) {
-
- String id = findIdFromFileName(pFile.getName());
-
- if (id != null) {
-
- List<ConfigurationListener> listeners = fileChangeToCallBack.get(id);
- if (listeners != null) {
- for (ConfigurationListener configurationListener : listeners) {
-
- Class<? extends BasicConfiguration> configClass = configurationListener.getType();
-
- BasicConfiguration basicConfiguration = yamlToObjectConverter.convert(pFile.getAbsolutePath(), configClass);
-
- if (basicConfiguration == null) {
- log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot update the listeners for file Change since the file content is invalid");
- continue;
- }
- log.debug("Loaded configuration after converting is {}", basicConfiguration);
-
+ if (pFile == null) {
+ LOGGER.debug("Invalid file '{}'.", pFile);
+ return;
+ }
- configurationListener.getCallBack().reconfigure(basicConfiguration);
+ if (fileChangeToCallBack == null) {
+ LOGGER.debug("File '{}' callback is null.", pFile);
+ return;
+ }
- }
- }
- } else {
+ final String id = findIdFromFileName(pFile.getName());
+ if (id == null) {
+ LOGGER.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","",
+ "Cannot calculate id from file {}", pFile.getName());
+ return;
+ }
- log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot calculate id from file {}", pFile.getName());
- }
+ final List<ConfigurationListener> listeners = fileChangeToCallBack.get(id);
+ if (CollectionUtils.isEmpty(listeners)) {
+ LOGGER.debug("No file listeners for file '{}', id '{}'.", pFile, id);
+ return;
+ }
+ for (final ConfigurationListener configurationListener : listeners) {
+ final Class<? extends BasicConfiguration> configClass = configurationListener.getType();
+ final BasicConfiguration basicConfiguration;
+ try {
+ basicConfiguration = yamlToObjectConverter.convert(pFile.getAbsolutePath(), configClass);
+ } catch (final YamlConversionException e) {
+ LOGGER.warn(EcompLoggerErrorCode.SCHEMA_ERROR,
+ "Configuration", "Configuration",
+ "Cannot update the listeners for file Change since the file content is invalid: {}",
+ e.getLocalizedMessage());
+ continue;
}
-
+ LOGGER.debug("Loaded configuration after converting is {}", basicConfiguration);
+ configurationListener.getCallBack().reconfigure(basicConfiguration);
}
-
- log.debug("File {} was changed.", pFile);
+ LOGGER.debug("File {} was changed.", pFile);
}
private String findIdFromFileName(String name) {
if (name.contains(File.separator)) {
startIndex = name.lastIndexOf(File.separator);
}
- // String subNameString = name.substring(startIndex, endIndex);
- // if (subNameString.contains(".")) {
- // endIndex = subNameString.indexOf(".");
- // }
result = name.substring(startIndex, endIndex);
}
- // public void notify(String id, BasicConfiguration object) {
- //
- // if (fileChangeToCallBack != null) {
- // List<ConfigurationListener> listeners = fileChangeToCallBack
- // .get(id);
- // if (listeners != null) {
- // for (ConfigurationListener configurationListener : listeners) {
- //
- // configurationListener.getCallBack().reconfigure(object);
- //
- // }
- // }
- // }
- //
- // }
-
}
import org.openecomp.sdc.common.api.ConfigurationListener;
import org.openecomp.sdc.common.api.ConfigurationSource;
import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.api.exception.LoadConfigurationException;
import org.openecomp.sdc.common.util.YamlToObjectConverter;
+import org.openecomp.sdc.exception.YamlConversionException;
/**
* Read configuration from file system
*
* @see org.openecomp.sdc.common.api.ConfigurationSource#getAndWatchConfiguration (java.lang.Class, org.openecomp.sdc.common.api.ConfigurationListener)
*/
- public <T> T getAndWatchConfiguration(Class<T> className, ConfigurationListener configurationListener) {
+ public <T> T getAndWatchConfiguration(final Class<T> className, final ConfigurationListener configurationListener) {
- String configFileName = calculateFileName(className);
+ final String configFileName = calculateFileName(className);
- T object = yamlToObjectConverter.convert(this.appConfigDir, className, configFileName);
+ T object;
+ try {
+ object = yamlToObjectConverter.convert(this.appConfigDir, className, configFileName);
+ } catch (final YamlConversionException e) {
+ final String errorMsg =
+ String.format("Could not load '%s' in '%s' for class '%s'", configFileName, appConfigDir, className);
+ throw new LoadConfigurationException(errorMsg, e);
+ }
if (configurationListener != null && changeListener != null) {
- if (object != null) {
- changeListener.register(configFileName, configurationListener);
- }
+ changeListener.register(configFileName, configurationListener);
}
return object;
package org.openecomp.sdc.common.util;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.commons.codec.binary.Base64;
-import org.openecomp.sdc.be.config.Configuration.*;
+import org.openecomp.sdc.be.config.Configuration.ApplicationL1CacheConfig;
+import org.openecomp.sdc.be.config.Configuration.ApplicationL2CacheConfig;
+import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig;
+import org.openecomp.sdc.be.config.Configuration.BeMonitoringConfig;
+import org.openecomp.sdc.be.config.Configuration.EcompPortalConfig;
+import org.openecomp.sdc.be.config.Configuration.OnboardingConfig;
+import org.openecomp.sdc.be.config.Configuration.SwitchoverDetectorConfig;
+import org.openecomp.sdc.be.config.Configuration.ToscaValidatorsConfig;
import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
import org.openecomp.sdc.be.config.DistributionEngineConfiguration.ComponentArtifactTypesConfig;
import org.openecomp.sdc.be.config.DistributionEngineConfiguration.CreateTopicConfig;
import org.openecomp.sdc.be.config.validation.DeploymentArtifactHeatConfiguration;
import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.exception.YamlConversionException;
import org.openecomp.sdc.fe.config.Configuration.FeMonitoringConfig;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.error.YAMLException;
import org.yaml.snakeyaml.introspector.PropertyUtils;
-import org.yaml.snakeyaml.nodes.Node;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
public class YamlToObjectConverter {
return yaml;
}
- public <T> T convert(String dirPath, Class<T> className, String configFileName) {
-
- T config = null;
-
- try {
-
- String fullFileName = dirPath + File.separator + configFileName;
-
- config = convert(fullFileName, className);
-
- } catch (Exception e) {
- log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", configFileName,e);
+ public <T> T convert(final String dirPath, final Class<T> className,
+ final String configFileName) throws YamlConversionException {
+ if (className == null) {
+ throw new IllegalArgumentException("className cannot be null");
}
-
- return config;
+ final String fullFileName = dirPath + File.separator + configFileName;
+ return convert(fullFileName, className);
}
- public class MyYamlConstructor extends org.yaml.snakeyaml.constructor.Constructor {
- private HashMap<String, Class<?>> classMap = new HashMap<>();
-
- public MyYamlConstructor(Class<? extends Object> theRoot) {
- super(theRoot);
- classMap.put(DistributionEngineConfiguration.class.getName(), DistributionEngineConfiguration.class);
- classMap.put(DistributionStatusTopicConfig.class.getName(), DistributionStatusTopicConfig.class);
+ public <T> T convert(String fullFileName, Class<T> className) throws YamlConversionException {
+ if (!new File(fullFileName).exists()) {
+ log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","",
+ "The file {} cannot be found. Ignore reading configuration.", fullFileName);
+ return null;
}
- /*
- * This is a modified version of the Constructor. Rather than using a
- * class loader to get external classes, they are already predefined
- * above. This approach works similar to the typeTags structure in the
- * original constructor, except that class information is pre-populated
- * during initialization rather than runtime.
- *
- * @see
- * org.yaml.snakeyaml.constructor.Constructor#getClassForNode(org.yaml.
- * snakeyaml.nodes.Node)
- */
- protected Class<?> getClassForNode(Node node) {
- String name = node.getTag().getClassName();
- Class<?> cl = classMap.get(name);
- if (cl == null)
- throw new YAMLException("Class not found: " + name);
- else
- return cl;
- }
- }
-
- public <T> T convert(String fullFileName, Class<T> className) {
-
- T config = null;
-
- Yaml yaml = getYamlByClassName(className);
-
- InputStream in = null;
- try {
+ final Yaml yaml = getYamlByClassName(className);
- File f = new File(fullFileName);
- if (!f.exists()) {
- log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","The file {} cannot be found. Ignore reading configuration.",fullFileName);
- return null;
- }
- in = Files.newInputStream(Paths.get(fullFileName));
-
- config = yaml.loadAs(in, className);
-
- // System.out.println(config.toString());
+ try (final InputStream in = Files.newInputStream(Paths.get(fullFileName))) {
+ return yaml.loadAs(in, className);
+ } catch (final IOException e) {
+ log.debug("Failed to open/close input stream", e);
} catch (Exception e) {
- log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", fullFileName, e);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- log.debug("Failed to close input stream", e);
- e.printStackTrace();
- }
- }
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","",
+ "Failed to convert yaml file {} to object.", fullFileName, e);
+ final String errorMsg = String.format("Could not parse '%s' to class '%s'", fullFileName, className);
+ throw new YamlConversionException(errorMsg, e);
}
- return config;
+ return null;
}
public <T> T convert(byte[] fileContents, Class<T> className) {
-
- T config = null;
-
- Yaml yaml = getYamlByClassName(className);
-
- InputStream in = null;
- try {
-
- in = new ByteArrayInputStream(fileContents);
-
- config = yaml.loadAs(in, className);
-
- } catch (Exception e) {
- log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object", e);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- log.debug("Failed to close input stream", e);
- e.printStackTrace();
- }
- }
+ final Yaml yaml = getYamlByClassName(className);
+
+ try (final InputStream in = new ByteArrayInputStream(fileContents)){
+ return yaml.loadAs(in, className);
+ } catch (final IOException e) {
+ log.debug("Failed to open or close input stream", e);
+ } catch (final Exception e) {
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,
+ "","","Failed to convert yaml file to object", e);
}
- return config;
+ return null;
}
public boolean isValidYamlEncoded64(byte[] fileContents) {
}
} catch (Exception e) {
- log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object - yaml is invalid", e);
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","",
+ "Failed to convert yaml file to object - yaml is invalid", e);
return false;
}
return true;
--- /dev/null
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2020 Nordix Foundation
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.exception;
+
+public class YamlConversionException extends Exception {
+
+ public YamlConversionException(final String s, final Throwable throwable) {
+ super(s, throwable);
+ }
+}
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
+import org.openecomp.sdc.exception.YamlConversionException;
import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertFalse;
}
@Test
- public void validateConvertWithFullFilePathReturnsValidObjectCreatedFromYaml() {
+ public void validateConvertWithFullFilePathReturnsValidObjectCreatedFromYaml() throws YamlConversionException {
Configuration result = yamlToObjectConverter.convert(filePath+fileName, Configuration.class);
assertThatCreatedObjectIsValid(result);
}
@Test
- public void validateConvertWithFullFilePathReturnsNullIfFileDoesNotExist() {
+ public void validateConvertWithFullFilePathReturnsNullIfFileDoesNotExist() throws YamlConversionException {
final String wrongFileName = "wrong-configuration.yaml";
Configuration result = yamlToObjectConverter.convert(wrongFileName, Configuration.class);
assertNull(result);
}
- @Test
- public void validateConvertWithFullFilePathReturnsNullIfClassDoesNotMathYaml() {
-
- HttpClient result = yamlToObjectConverter.convert(filePath+fileName, HttpClient.class);
-
- assertNull(result);
+ @Test(expected = YamlConversionException.class)
+ public void validateConvertWithFullFilePathThrowsExceptionIfClassDoesNotMathYaml() throws YamlConversionException {
+ yamlToObjectConverter.convert(filePath + fileName, HttpClient.class);
}
@Test
- public void validateConvertWithFilePathAndFileNameReturnsValidObjectCreatedFromYaml() {
+ public void validateConvertWithFilePathAndFileNameReturnsValidObjectCreatedFromYaml()
+ throws YamlConversionException {
Configuration result = yamlToObjectConverter.convert(filePath, Configuration.class, fileName);
assertThatCreatedObjectIsValid(result);
}
- @Test
- public void validateConvertWithFilePathAndFileNameReturnsNullIfClassIsNull() {
-
- HttpClient result = yamlToObjectConverter.convert(filePath, null, fileName);
-
- assertNull(result);
+ @Test(expected = IllegalArgumentException.class)
+ public void validateConvertWithFilePathAndFileNameThrowsExceptionIfClassIsNull() throws YamlConversionException {
+ yamlToObjectConverter.convert(filePath, null, fileName);
}
@Test
@Before
public void setUp() {
- String appConfigDir = "src/test/resources/config/common";
+ String appConfigDir = "src/test/resources/config/fe";
ConfigurationSource configurationSource =
new FSConfigurationSource(ExternalConfiguration.getChangeListener(), appConfigDir);
configurationManager = new ConfigurationManager(configurationSource);
- VFC
- CVFC
- # Resource informational deployment artifact placeholder
- resourceInformationalDeployedArtifacts:
-
# Requirements needed to be fulfilled before certification
requirementsToFulfillBeforeCert:
- yaml
- yml
-resourceInformationalDeployedArtifacts:
- YANG_XML:
- acceptedTypes:
- - xml
-
-
unLoggedUrls:
- /sdc2/rest/healthCheck
- yaml
- yml
-resourceInformationalDeployedArtifacts:
- YANG_XML:
- acceptedTypes:
- - xml
-
-
unLoggedUrls:
- /sdc2/rest/healthCheck
- VFC
- CVFC
-resourceInformationalDeployedArtifacts:
-
requirementsToFulfillBeforeCert:
capabilitiesToConsumeBeforeCert:
password: Pass
dmeConfiguration:
- dme2Search: DME2SEARCH
- dme2Resolve: DME2RESOLVE
+ lookupUriFormat: "http://DME2RESOLVE/service=%s/version=1.0.0/envContext=%s/routeOffer=DEFAULT"
Code Review / sdc.git / commitdiff