.DS_Store
internal.rst
ims
+tmp
+cscf
this.selfRegistrationManagerForSo = selfRegistrationManagerForSo;
}
+ private static boolean isDirect(ConfigurableApplicationContext applicationContext) {
+ return newHashSet(applicationContext.getEnvironment().getActiveProfiles()).contains("direct");
+ }
+
@Override
public void onApplicationEvent(ApplicationReadyEvent contextRefreshedEvent) {
Callable<Boolean> singleRegistration = () -> {
});
}
- private static boolean isDirect(ConfigurableApplicationContext applicationContext) {
- return newHashSet(applicationContext.getEnvironment().getActiveProfiles()).contains("direct");
- }
-
}
/**
}
if (nsId.isPresent()) {
addSingletonRelation(vnf.getRelationshipList(), linkToNs(nsId.get()));
- }
- else{
+ } else {
logger.warn("Not linking VNF with {} identifier to any NS", vnfId);
}
aaiRestApiProvider.getNetworkApi().createOrUpdateNetworkGenericVnfsGenericVnf(vnf.getVnfId(), vnf).blockingFirst();
--- /dev/null
+/*
+ * Copyright 2016-2017, Nokia Corporation
+ *
+ * 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.
+ */
+
+package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.regex.Pattern;
+import org.slf4j.Logger;
+import org.yaml.snakeyaml.Yaml;
+
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.child;
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.childElement;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Transforms a CBAM package into an ONAP package
+ */
+public class OnapAbstractVnfdBuilder {
+ public static final String DESCRIPTION = "description";
+ public static final String PROPERTIES = "properties";
+ public static final String REQUIREMENTS = "requirements";
+ private static Logger logger = getLogger(OnapAbstractVnfdBuilder.class);
+
+ @VisibleForTesting
+ static String indent(String content, int prefixSize) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < prefixSize; i++) {
+ sb.append(" ");
+ }
+ Pattern pattern = Pattern.compile("^(.*)$", Pattern.MULTILINE);
+ return pattern.matcher(content).replaceAll(sb.toString() + "$1");
+ }
+
+ protected static String getRequirement(JsonArray requirements, String key) {
+ for (int i = 0; i < requirements.size(); i++) {
+ JsonElement requirement = requirements.get(i);
+ Map.Entry<String, JsonElement> next = requirement.getAsJsonObject().entrySet().iterator().next();
+ String s = next.getKey();
+ if (key.equals(s)) {
+ return next.getValue().getAsString();
+ }
+ }
+ return null;
+ }
+
+ private JsonElement get(String name, Set<Map.Entry<String, JsonElement>> nodes) {
+ for (Map.Entry<String, JsonElement> node : nodes) {
+ if (name.equals(node.getKey())) {
+ return node.getValue();
+ }
+ }
+ throw new NoSuchElementException("The VNFD does not have a node called " + name + " but required by an other node");
+ }
+}
* Transforms a CBAM package into an ONAP package
*/
-public class OnapVnfPackageBuilder {
+public class OnapR1VnfPackageBuilder {
/**
* Entry point for the command line package transformer
* @param args not used (required due to signature)
*/
public static void main(String[] args) throws Exception {
- byte[] covert = new OnapVnfPackageBuilder().covert(systemFunctions().in());
+ byte[] covert = new OnapR1VnfPackageBuilder().covert(systemFunctions().in(), SupportedOnapPackageVersions.V1);
systemFunctions().out().write(covert);
}
/**
- * @param zip the original CBAM package
+ * @param zip the original CBAM package
+ * @param version
* @return the converted ONAP package
*/
- public byte[] covert(InputStream zip) throws IOException {
+ public byte[] covert(InputStream zip, SupportedOnapPackageVersions version) throws IOException {
byte[] cbamVnfPackage = ByteStreams.toByteArray(zip);
String vnfdLocation = getVnfdLocation(new ByteArrayInputStream(cbamVnfPackage));
ByteArrayOutputStream vnfdContent = getFileInZip(new ByteArrayInputStream(cbamVnfPackage), vnfdLocation);
byte[] cbamVnfdContent = vnfdContent.toByteArray();
- String onapVnfd = new OnapVnfdBuilder().toOnapVnfd(new String(cbamVnfdContent, StandardCharsets.UTF_8));
+ String onapVnfd = SupportedOnapPackageVersions.V2 == version ?
+ new OnapR2VnfdBuilder().toOnapVnfd(new String(cbamVnfdContent, StandardCharsets.UTF_8)) :
+ new OnapVnfdBuilder().toOnapVnfd(new String(cbamVnfdContent, StandardCharsets.UTF_8));
byte[] modifiedCbamPackage = new CbamVnfPackageBuilder().toModifiedCbamVnfPackage(cbamVnfPackage, vnfdLocation, new CbamVnfdBuilder().build(new String(cbamVnfdContent)));
return buildNewOnapPackage(modifiedCbamPackage, onapVnfd);
}
out.close();
return result.toByteArray();
}
-
-
}
--- /dev/null
+/*
+ * Copyright 2016-2017, Nokia Corporation
+ *
+ * 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.
+ */
+
+package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.core.SelfRegistrationManager;
+import org.slf4j.Logger;
+import org.yaml.snakeyaml.Yaml;
+
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer.OnapVnfdBuilder.getRequirement;
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer.OnapVnfdBuilder.indent;
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.child;
+import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.childElement;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Transforms a CBAM package into an ONAP package
+ */
+public class OnapR2VnfdBuilder {
+ public static final String DESCRIPTION = "description";
+ public static final String PROPERTIES = "properties";
+ public static final String REQUIREMENTS = "requirements";
+ private static Logger logger = getLogger(OnapR2VnfdBuilder.class);
+
+ private static String trimUnit(String data) {
+ //FIXME the unit should not be trimmed VF-C bug
+ return data;
+ //data.trim().replaceAll("[^0-9]", "");
+ }
+
+ /**
+ * @param cbamVnfd the CBAM VNFD
+ * @return the converted ONAP VNFD
+ */
+ public String toOnapVnfd(String cbamVnfd) {
+ JsonObject root = new Gson().toJsonTree(new Yaml().load(cbamVnfd)).getAsJsonObject();
+ JsonObject topologyTemplate = child(root, "topology_template");
+ JsonObject substitution_mappings = child(topologyTemplate, "substitution_mappings");
+ Map<String, JsonElement> virtualLinks = new HashMap<>();
+ if (topologyTemplate.has("node_templates")) {
+ Set<Map.Entry<String, JsonElement>> nodeTemplates = child(topologyTemplate, "node_templates").entrySet();
+
+ StringBuilder body = new StringBuilder();
+ for (Map.Entry<String, JsonElement> node : nodeTemplates) {
+ String type = childElement(node.getValue().getAsJsonObject(), "type").getAsString();
+ if ("tosca.nodes.nfv.VDU".equals(type)) {
+ body.append(buildVdu(node.getKey(), substitution_mappings, node.getValue().getAsJsonObject(), nodeTemplates));
+ } else if ("tosca.nodes.nfv.VirtualStorage".equals(type)) {
+ body.append(buildVolume(node.getKey(), node.getValue().getAsJsonObject()));
+ } else if ("tosca.nodes.nfv.VL".equals(type)) {
+ virtualLinks.put(node.getKey(), node.getValue());
+ body.append(buildVl(node.getValue().getAsJsonObject().get(PROPERTIES).getAsJsonObject(), node.getKey()));
+ } else if ("tosca.nodes.nfv.ICP".equals(type)) {
+ body.append(buildIcp(node.getKey(), node.getValue().getAsJsonObject()));
+ } else if ("tosca.nodes.nfv.ECP".equals(type)) {
+ body.append(buildEcp(node.getKey(), node.getValue(), nodeTemplates));
+ } else {
+ logger.warn("The {} type is not converted", type);
+ }
+ }
+ return buildHeader(topologyTemplate, virtualLinks) + body.toString();
+ }
+ return buildHeader(topologyTemplate, virtualLinks);
+ }
+
+ private String buildHeader(JsonObject toplogyTemplate, Map<String, JsonElement> virtualLinks) {
+ JsonObject substitution_mappings = child(toplogyTemplate, "substitution_mappings");
+ String vnfContent = buildVnf(substitution_mappings, virtualLinks);
+ return "tosca_definitions_version: tosca_simple_profile_yaml_1_1\n" +
+ "\n" +
+ "topology_template:\n" +
+ " inputs:\n" +
+ " etsi_config:\n" +
+ " type: string\n" +
+ " description: The ETSI configuration\n" +
+ " node_templates:\n" + vnfContent;
+ }
+
+ private JsonElement get(String name, Set<Map.Entry<String, JsonElement>> nodes) {
+ for (Map.Entry<String, JsonElement> node : nodes) {
+ if (name.equals(node.getKey())) {
+ return node.getValue();
+ }
+ }
+ throw new NoSuchElementException("The VNFD does not have a node called " + name + " but required by an other node");
+ }
+
+ private String buildVdu(String name, JsonObject vnf, JsonObject vdu, Set<Map.Entry<String, JsonElement>> nodes) {
+ String memorySize = "";
+ String cpuCount = "";
+ StringBuilder body = new StringBuilder();
+ JsonArray vduRequirements = childElement(vdu.getAsJsonObject(), REQUIREMENTS).getAsJsonArray();
+ for (int i = 0; i < vduRequirements.size(); i++) {
+ JsonObject requirement = vduRequirements.get(i).getAsJsonObject();
+ Map.Entry<String, JsonElement> next = requirement.entrySet().iterator().next();
+ String s = next.getKey();
+ if ("virtual_compute".equals(s)) {
+ JsonObject virtualCompute = get(next.getValue().getAsString(), nodes).getAsJsonObject();
+ cpuCount = childElement(child(child(virtualCompute, PROPERTIES), "virtual_cpu"), "num_virtual_cpu").getAsString();
+ memorySize = trimUnit(childElement(child(child(virtualCompute, PROPERTIES), "virtual_memory"), "virtual_mem_size").getAsString());
+ } else if ("virtual_storage".equals(s)) {
+ String item = indent(
+ "- virtual_storage:\n" +
+ " capability: tosca.capabilities.nfv.VirtualStorage\n" +
+ " node: " + next.getValue().getAsString() + "\n", 4);
+ body.append(item);
+ }
+ next.getValue();
+ }
+ JsonObject flavourProperties = child(child(child(vnf, "capabilities"), "deployment_flavour"), "properties");
+ JsonObject vduSizes = child(child(flavourProperties, "vdu_profile"), name);
+ String header = indent(name + ":\n" +
+ " type: tosca.nodes.nfv.Vdu.Compute\n" +
+ " properties:\n" +
+ " name: " + name + "\n" +
+ " description: " + childElement(child(vdu, PROPERTIES), "description").getAsString() + "\n" +
+ " configurable_properties:\n" +
+ " vdu_profile:\n" +
+ " min_number_of_instances: " + childElement(vduSizes, "min_number_of_instances").getAsString() + "\n" +
+ " max_number_of_instances: " + childElement(vduSizes, "max_number_of_instances").getAsString() + "\n" +
+ " capabilities:\n" +
+ " virtual_compute:\n" +
+ indent(
+ "properties:\n" +
+ " virtual_memory:\n" +
+ " virtual_mem_size: " + trimUnit(memorySize) + "\n" +
+ " virtual_cpu:\n" +
+ " num_virtual_cpu: " + cpuCount + "\n", 3) +
+ " " + REQUIREMENTS + ":\n", 2);
+ return header + body.toString();
+ }
+
+ private String buildEcp(String name, JsonElement ecp, Set<Map.Entry<String, JsonElement>> nodes) {
+ if (ecp.getAsJsonObject().has(REQUIREMENTS)) {
+ String icpName = getRequirement(ecp.getAsJsonObject().get(REQUIREMENTS).getAsJsonArray(), "internal_connection_point");
+ if (icpName != null) {
+ return buildEcpInternal(name, icpName, nodes);
+ } else {
+ logger.warn("The {} ecp does not have an internal connection point", name);
+ }
+ } else {
+ logger.warn("The {} ecp does not have an requirements section", name);
+ }
+ return "";
+ }
+
+ private String buildVnf(JsonObject vnf, Map<String, JsonElement> virtualLinks) {
+ JsonObject vnfProperties = child(vnf, PROPERTIES);
+ JsonObject flavourProperties = child(child(child(vnf, "capabilities"), "deployment_flavour"), "properties");
+ StringBuilder vlContent = new StringBuilder();
+ for (Map.Entry<String, JsonElement> virtualLink : virtualLinks.entrySet()) {
+ vlContent.append(indent("- virtual_link:\n" +
+ " capability: tosca.capabilities.nfv.VirtualLinkable\n" +
+ " node: " + virtualLink.getKey() + "\n", 4));
+ }
+ return indent("VNF:\n" +
+ " type: tosca.nodes.nfv.VNF\n" +
+ " " + PROPERTIES + ":\n" +
+ " descriptor_id: " + childElement(vnfProperties, "descriptor_id").getAsString() + "\n" +
+ " descriptor_version: " + childElement(vnfProperties, "descriptor_version").getAsString() + "\n" +
+ " provider: " + childElement(vnfProperties, "provider").getAsString() + "\n" +
+ " product_name: " + childElement(vnfProperties, "product_name").getAsString() + "\n" +
+ " software_version: " + childElement(vnfProperties, "software_version").getAsString() + "\n" +
+ " product_info_name: " + childElement(vnfProperties, "product_info_name").getAsString() + "\n" +
+ (vnfProperties.has("product_info_description") ?
+ " product_info_description: " + childElement(vnfProperties, "product_info_description").getAsString() + "\n" : "") +
+ " vnfm_info: [ " + SelfRegistrationManager.SERVICE_NAME + " ]\n" +
+ " flavour_id: " + childElement(flavourProperties, "flavour_id").getAsString() + "\n" +
+ " flavour_description: " + childElement(flavourProperties, "description").getAsString() + "\n", 2) +
+ " " + REQUIREMENTS + ":\n" +
+ vlContent.toString();
+ }
+
+ private String buildEcpInternal(String ecpName, String icpName, Set<Map.Entry<String, JsonElement>> nodes) {
+ JsonObject icpNode = get(icpName, nodes).getAsJsonObject();
+ if (icpNode.has(REQUIREMENTS)) {
+ String vdu = getRequirement(icpNode.getAsJsonObject().get(REQUIREMENTS).getAsJsonArray(), "virtual_binding");
+ //internal connection point is bound to VDU
+ if (vdu != null) {
+ return buildVduCpd(ecpName, vdu, child(icpNode, PROPERTIES));
+ } else {
+ logger.warn("The {} internal connection point of the {} ecp does not have a VDU", icpName, ecpName);
+ }
+ } else {
+ logger.warn("The {} internal connection point of the {} ecp does not have a requirements section", icpName, ecpName);
+ }
+ return "";
+ }
+
+ private String buildIcp(String name, JsonObject icp) {
+ if (icp.has(REQUIREMENTS)) {
+ JsonArray requirements = icp.get(REQUIREMENTS).getAsJsonArray();
+ String vdu = getRequirement(requirements, "virtual_binding");
+ String vl = getRequirement(requirements, "virtual_link");
+ if (vdu == null) {
+ logger.warn("The {} internal connection point does not have a VDU", name);
+ } else if (vl == null) {
+ logger.warn("The {} internal connection point does not have a VL", name);
+ } else {
+ JsonObject properties = child(icp, PROPERTIES);
+ return indent(name + ":\n" +
+ " type: tosca.nodes.nfv.VduCp\n" +
+ " " + PROPERTIES + ":\n" +
+ " layer_protocol: [ " + childElement(properties, "layer_protocol").getAsString() + " ]\n" +
+ (properties.has(DESCRIPTION) ?
+ " description: " + childElement(properties, DESCRIPTION).getAsString() + "\n" : "") +
+ " protocol_data: []\n" +
+ " trunk_mode: false\n" +
+ " requirements:\n" +
+ " - virtual_binding: " + vdu + "\n" +
+ " - virtual_link: " + vl + "\n", 2);
+ }
+ } else {
+ logger.warn("The {} internal connection point does not have a requirements section", name);
+ }
+ return "";
+ }
+
+ private String buildVduCpd(String name, String vdu, JsonObject properties) {
+ return indent(name + ":\n" +
+ " type: tosca.nodes.nfv.VduCp\n" +
+ " " + PROPERTIES + ":\n" +
+ " layer_protocol: [ " + childElement(properties, "layer_protocol").getAsString() + " ]\n" +
+ " protocol_data: [ ]\n" +
+ " trunk_mode: false\n" +
+ (properties.has(DESCRIPTION) ?
+ " description: " + childElement(properties, DESCRIPTION).getAsString() + "\n" : "") +
+ " requirements:\n" +
+ " - virtual_binding: " + vdu + "\n", 2);
+ }
+
+ private String buildVolume(String nodeName, JsonObject volume) {
+ return indent(nodeName + ":\n" +
+ " type: tosca.nodes.nfv.Vdu.VirtualStorage\n" +
+ " properties:\n" +
+ " type_of_storage: volume\n" +
+ " size_of_storage: " + trimUnit(childElement(child(volume, PROPERTIES), "size_of_storage").getAsString()) + "\n", 2);
+ }
+
+ private String buildVl(JsonObject vlProperties, String name) {
+ return indent(name + ":\n" +
+ " type: tosca.nodes.nfv.VnfVirtualLink\n" +
+ " properties:\n" +
+ " connectivity_type:\n" +
+ " layer_protocol: [ " + childElement(child(vlProperties, "connectivity_type"), "layer_protocol").getAsString() + " ]\n" +
+ " flow_pattern: " + childElement(child(vlProperties, "connectivity_type"), "flow_pattern").getAsString() + "\n" +
+ " vl_profile:\n" +
+ " max_bit_rate_requirements:\n" +
+ " root: " + Integer.MAX_VALUE + "\n" + //FIXME GAP IN CBAM TEMPLATE
+ " leaf: " + Integer.MAX_VALUE + "\n" + //FIXME GAP IN CBAM TEMPLATE
+ " min_bit_rate_requirements:\n" +
+ " root: 0\n" + //FIXME GAP IN CBAM TEMPLATE
+ " leaf: 0\n", 2); //FIXME GAP IN CBAM TEMPLATE
+ }
+}
return data.trim().replaceAll("[^0-9]", "");
}
+ public static String getRequirement(JsonArray requirements, String key) {
+ for (int i = 0; i < requirements.size(); i++) {
+ JsonElement requirement = requirements.get(i);
+ Map.Entry<String, JsonElement> next = requirement.getAsJsonObject().entrySet().iterator().next();
+ String s = next.getKey();
+ if (key.equals(s)) {
+ return next.getValue().getAsString();
+ }
+ }
+ return null;
+ }
+
/**
* @param cbamVnfd the CBAM VNFD
* @return the converted ONAP VNFD
"topology_template:\n" +
" inputs:\n" +
" etsi_config:\n" +
- " type: string\n"+
- " description: The ETSI configuration\n"+
+ " type: string\n" +
+ " description: The ETSI configuration\n" +
" node_templates:\n";
}
private String buildEcp(String name, JsonElement ecp, Set<Map.Entry<String, JsonElement>> nodes) {
if (ecp.getAsJsonObject().has(REQUIREMENTS)) {
- String icpName = getIcpName(ecp.getAsJsonObject().get(REQUIREMENTS).getAsJsonArray());
+ String icpName = getRequirement(ecp.getAsJsonObject().get(REQUIREMENTS).getAsJsonArray(), "internal_connection_point");
if (icpName != null) {
return buildEcpInternal(name, icpName, nodes);
} else {
private String buildEcpInternal(String ecpName, String icpName, Set<Map.Entry<String, JsonElement>> nodes) {
JsonObject icpNode = get(icpName, nodes).getAsJsonObject();
if (icpNode.has(REQUIREMENTS)) {
- String vdu = getVduOfIcp(icpNode.getAsJsonObject().get(REQUIREMENTS).getAsJsonArray());
+ String vdu = getRequirement(icpNode.getAsJsonObject().get(REQUIREMENTS).getAsJsonArray(), "virtual_binding");
//internal connection point is bound to VDU
if (vdu != null) {
return buildVduCpd(ecpName, vdu, child(icpNode, PROPERTIES));
return "";
}
- private String getVduOfIcp(JsonArray icpRequirements) {
- String vdu = null;
- for (int i = 0; i < icpRequirements.size(); i++) {
- JsonElement requirement = icpRequirements.get(i);
- Map.Entry<String, JsonElement> next = requirement.getAsJsonObject().entrySet().iterator().next();
- String s = next.getKey();
- if ("virtual_binding".equals(s)) {
- vdu = next.getValue().getAsString();
- }
- }
- return vdu;
- }
-
- private String getIcpName(JsonArray requirements) {
- String icpName = null;
- for (int i = 0; i < requirements.size(); i++) {
- JsonElement requirement = requirements.get(i);
- Map.Entry<String, JsonElement> next = requirement.getAsJsonObject().entrySet().iterator().next();
- String s = next.getKey();
- if ("internal_connection_point".equals(s)) {
- icpName = next.getValue().getAsString();
- }
- }
- return icpName;
- }
-
private String buildIcp(String name, JsonObject icp) {
if (icp.has(REQUIREMENTS)) {
JsonArray requirements = icp.get(REQUIREMENTS).getAsJsonArray();
- String vdu = null;
- String vl = null;
- for (int i = 0; i < requirements.size(); i++) {
- JsonElement requirement = requirements.get(i);
- Map.Entry<String, JsonElement> next = requirement.getAsJsonObject().entrySet().iterator().next();
- String s = next.getKey();
- if ("virtual_binding".equals(s)) {
- vdu = next.getValue().getAsString();
- } else if ("virtual_link".equals(s)) {
- vl = next.getValue().getAsString();
- }
- }
+ String vdu = getRequirement(requirements, "virtual_binding");
+ String vl = getRequirement(requirements, "virtual_link");
if (vdu == null) {
logger.warn("The {} internal connection point does not have a VDU", name);
} else if (vl == null) {
--- /dev/null
+/*
+ * Copyright 2016-2017, Nokia Corporation
+ *
+ * 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.
+ */
+
+package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer;
+
+/**
+ * The supported ONAP package versions
+ */
+public enum SupportedOnapPackageVersions {
+ V1,
+ V2
+}
\ No newline at end of file
*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.restapi;
+import com.google.common.base.Charsets;
import com.google.common.io.ByteStreams;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer.OnapVnfPackageBuilder;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer.OnapR1VnfPackageBuilder;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer.SupportedOnapPackageVersions;
import org.slf4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping(value = BASE_URL)
public class ConverterApi {
private static Logger logger = getLogger(ConverterApi.class);
- private OnapVnfPackageBuilder vnfPackageConverter = new OnapVnfPackageBuilder();
+ private OnapR1VnfPackageBuilder vnfPackageConverter = new OnapR1VnfPackageBuilder();
/**
* Return the converted ONAP package
@ResponseBody
public void convert(HttpServletResponse httpResponse, HttpServletRequest request) throws IOException {
logger.info("REST: convert package");
+ SupportedOnapPackageVersions version;
+ try {
+ request.getPart("version");
+ version = SupportedOnapPackageVersions.valueOf(new String(ByteStreams.toByteArray(request.getPart("version").getInputStream()), Charsets.UTF_8));
+ } catch (Exception e) {
+ throw buildFatalFailure(logger, "Unable to determine the desired ONAP package version", e);
+ }
byte[] content;
try {
- Part part = request.getPart("fileToUpload");
- content = ByteStreams.toByteArray(part.getInputStream());
+ Part uploadedFile = request.getPart("fileToUpload");
+ content = ByteStreams.toByteArray(uploadedFile.getInputStream());
} catch (Exception e) {
throw buildFatalFailure(logger, "Unable to extract package from REST parameters", e);
}
byte[] convertedPackage;
try {
- convertedPackage = vnfPackageConverter.covert(new ByteArrayInputStream(content));
+ convertedPackage = vnfPackageConverter.covert(new ByteArrayInputStream(content), version);
} catch (Exception e) {
throw buildFatalFailure(logger, "Unable to convert VNF package", e);
}
* The location of the CBAM package within the ONAP package
*/
public static final String CBAM_PACKAGE_NAME_IN_ZIP = "Artifacts/Deployment/OTHER/cbam.package.zip";
- public static final String ETSI_CONFIG_NAME_IN_ZIP = "Artifacts/Deployment/OTHER/" + ETSI_CONFIG +".json";
+ public static final String ETSI_CONFIG_NAME_IN_ZIP = "Artifacts/Deployment/OTHER/" + ETSI_CONFIG + ".json";
private static final String TOSCA_META_PATH = "TOSCA-Metadata/TOSCA.meta";
private static final String TOSCA_VNFD_KEY = "Entry-Definitions";
public CatalogAdapterVnfpackage preparePackageInCbam(String vnfmId, String csarId) {
String cbamVnfdId = packageProvider.getCbamVnfdId(csarId);
DefaultApi cbamCatalogApi = cbamRestApiProvider.getCbamCatalogApi(vnfmId);
- if (!isPackageReplicated(cbamVnfdId, cbamCatalogApi)) {
+ if (!isPackageReplicated(cbamVnfdId, cbamCatalogApi)) {
try {
ByteArrayOutputStream cbamPackage = getFileInZip(new ByteArrayInputStream(packageProvider.getPackage(csarId)), CBAM_PACKAGE_NAME_IN_ZIP);
return cbamCatalogApi.create(create(parse(APPLICATION_OCTET_STREAM.toString()), cbamPackage.toByteArray())).blockingFirst();
/**
* Download the ETSI configuration of the VNF
+ *
* @param csarId the CSAR identifier of the package in ONAP catalog
* @return the content of the ETSI configuration
*/
- public String getEtsiConfiguration(String csarId){
+ public String getEtsiConfiguration(String csarId) {
try {
ByteArrayOutputStream etsiConfig = getFileInZip(new ByteArrayInputStream(packageProvider.getPackage(csarId)), ETSI_CONFIG_NAME_IN_ZIP);
return new String(etsiConfig.toByteArray(), Charsets.UTF_8);
- }
- catch (Exception e){
+ } catch (Exception e) {
throw buildFatalFailure(logger, "Unable to download the ETSI configuration file");
}
}
public static final String BASE_URL = "/api" + BASE_SUFFIX;
public static final String LCN_URL = "/lcn";
- private Constants(){
+ private Constants() {
//use in static way
}
}
import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
import javax.servlet.http.HttpServletResponse;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.api.IGrantManager;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.api.VimInfoProvider;
import static java.lang.Integer.parseInt;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.stream.Collectors.toList;
import static com.google.common.base.Splitter.on;
import static com.google.common.collect.Iterables.find;
private AdditionalParameters convertInstantiationAdditionalParams(String csarId, Object additionalParams) {
JsonObject root = new Gson().toJsonTree(additionalParams).getAsJsonObject();
- if(root.has(PROPERTIES)){
+ if (root.has(PROPERTIES)) {
JsonObject properties = new JsonParser().parse(root.get(PROPERTIES).getAsString()).getAsJsonObject();
- if(properties.has(ETSI_CONFIG)){
+ if (properties.has(ETSI_CONFIG)) {
JsonElement etsiConfig = properties.get(ETSI_CONFIG);
return new Gson().fromJson(etsiConfig.getAsString(), AdditionalParameters.class);
+ } else {
+ logger.info("The instantiation input for VNF with {} CSAR id does not have an " + ETSI_CONFIG + " section", csarId);
}
- else{
- logger.info("The instantiation input for VNF with {} CSAR id does not have an " + ETSI_CONFIG +" section", csarId);
- }
- }
- else{
+ } else {
logger.info("The instantiation input for VNF with {} CSAR id does not have a properties section", csarId);
}
JsonObject inputs = child(root, "inputs");
private Set<Map.Entry<String, JsonElement>> getAcceptableOperationParameters(String vnfdContent, String operationName) {
JsonObject root = new Gson().toJsonTree(new Yaml().load(vnfdContent)).getAsJsonObject();
JsonObject interfaces = child(child(child(root, "topology_template"), "substitution_mappings"), "interfaces");
- for (Map.Entry<String, JsonElement> categoryOfOperation : interfaces.entrySet()) {
- for (Map.Entry<String, JsonElement> operation : categoryOfOperation.getValue().getAsJsonObject().entrySet()) {
- if(operation.getKey().equals(operationName)){
- JsonObject additionalParameters = child(child(operation.getValue().getAsJsonObject(), "inputs"), "additional_parameters");
- return additionalParameters.entrySet();
- }
+ List<List<Map.Entry<String, JsonElement>>> operations = interfaces.entrySet().stream().map(m -> m.getValue().getAsJsonObject().entrySet().stream().collect(toList())).collect(toList());
+ for (Map.Entry<String, JsonElement> operation : operations.stream().flatMap(List::stream).collect(toList())) {
+ if (operation.getKey().equals(operationName)) {
+ return child(child(operation.getValue().getAsJsonObject(), "inputs"), "additional_parameters").entrySet();
}
- logger.debug("The {} operation was not found in {} interface", operationName, categoryOfOperation.getKey());
}
throw buildFatalFailure(logger, "Unable to find operation named " + operationName);
}
}
}
- private void addSpecifiedExtensions(String vnfmId, String vnfId, AdditionalParameters additionalParameters){
- if(!additionalParameters.getExtensions().isEmpty()){
+ private void addSpecifiedExtensions(String vnfmId, String vnfId, AdditionalParameters additionalParameters) {
+ if (!additionalParameters.getExtensions().isEmpty()) {
ModifyVnfInfoRequest request = new ModifyVnfInfoRequest();
request.setExtensions(new ArrayList<>());
request.getExtensions().addAll(additionalParameters.getExtensions());
executeModifyVnfInfo(vnfmId, vnfId, request);
- }
- else{
+ } else {
logger.info("No extensions specified for VNF with {} identifier", vnfId);
}
}
} else {
return handleFailure(operationExecution);
}
- }
- catch(OperationMustBeAborted handledFailuire){
+ } catch (OperationMustBeAborted handledFailuire) {
throw handledFailuire;
- }
- catch (Exception e) {
+ } catch (Exception e) {
logger.warn("Unable to build affected connection points", e);
return toleratedFailure();
}
{
"description": "The CBAM VNF package",
"in": "formData",
- "name": "upfile",
+ "name": "fileToUpload",
"type": "file"
+ },
+ {
+ "description": "ONAP version of the package",
+ "in": "formData",
+ "name": "version",
+ "type": "string"
}
],
"summary": "Converts the Nokia CBAM package to ONAP package",
<form action="/api/NokiaSVNFM/v1/convert" method="post" enctype="multipart/form-data">
Select CBAM package to upload:
- <input type="file" name="fileToUpload" id="fileToUpload">
+ <input type="file" name="fileToUpload" id="fileToUpload"> ONAP package version:
+ <select name="version">
+ <option value="V1">V1</option>
+ <option value="V2" selected="selected">V2</option>
+ </select>
<input type="submit" value="Upload" name="submit">
</form>
-
</body>
</html>
\ No newline at end of file
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
- if(calls.size() == 0){
+ if (calls.size() == 0) {
calls.add(true);
throw e2;
}
doAnswer(new Answer() {
@Override
public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
- if(calls.size() == 0){
+ if (calls.size() == 0) {
calls.add(true);
throw e2;
}
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcNotificationSender;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.TestBase;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.notification.LifecycleChangeNotificationManagerForVfc;
import static junit.framework.TestCase.assertNotNull;
-import static org.junit.Assert.*;
public class TestSelfRegistrationManagerForSo extends TestBase {
@Test
import org.junit.Test;
import org.mockito.Mockito;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcExternalSystemInfoProvider;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcNotificationSender;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.TestBase;
import static junit.framework.TestCase.assertNotNull;
* the list of VNFMs is retrieved from AAI
*/
@Test
- public void testQueryAAIExternaSystemProvider() throws Exception{
+ public void testQueryAAIExternaSystemProvider() throws Exception {
EsrVnfmList e = new EsrVnfmList();
EsrVnfm esrVnfmItem = new EsrVnfm();
esrVnfmItem.setVnfmId(VNFM_ID);
* The VNFM identifier is loaded from property files
*/
@Test
- public void testGetVnfms(){
+ public void testGetVnfms() {
setFieldWithPropertyAnnotation(vfcExternalSystemInfoProvider, "${vnfmId}", "myVnfmId");
assertEquals(Sets.newHashSet("myVnfmId"), vfcExternalSystemInfoProvider.getVnfms());
}
import static java.util.Optional.empty;
import static java.util.Optional.of;
-import static junit.framework.TestCase.*;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.fail;
import static org.mockito.Mockito.*;
import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.CbamRestApiProvider.NOKIA_LCM_API_VERSION;
import static org.springframework.test.util.ReflectionTestUtils.setField;
--- /dev/null
+/*
+ * Copyright 2016-2017, Nokia Corporation
+ *
+ * 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.
+ */
+package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer;
+
+import java.util.NoSuchElementException;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.TestUtil;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.TestBase;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.fail;
+import static org.springframework.test.util.ReflectionTestUtils.setField;
+
+
+public class TestOnapR2VnfdBuilder extends TestBase {
+ private OnapR2VnfdBuilder packageTransformer = new OnapR2VnfdBuilder();
+
+
+ @Before
+ public void init() {
+ setField(OnapVnfdBuilder.class, "logger", logger);
+ }
+
+
+ /**
+ * Test empty VNFD conversion
+ */
+ @Test
+ public void testEmpty() {
+ assertEquals(new String(TestUtil.loadFile("unittests/packageconverter/empty.vnfd.onap.v2.yaml")), packageTransformer.toOnapVnfd(new String(TestUtil.loadFile("unittests/packageconverter/empty.vnfd.cbam.yaml"))));
+ }
+
+ /**
+ * Test all Tosca nodes conversions for successful scenario
+ */
+ @Test
+ public void testNodes() {
+ assertEquals(new String(TestUtil.loadFile("unittests/packageconverter/nodes.vnfd.onap.v2.yaml")), packageTransformer.toOnapVnfd(new String(TestUtil.loadFile("unittests/packageconverter/nodes.vnfd.cbam.yaml"))));
+ /* verify(logger).warn("The {} ecp does not have an internal connection point", "myEcpWithoutIcp");
+ verify(logger).warn("The {} ecp does not have an requirements section", "ecpWithIcpWithOutRequirements");
+ verify(logger).warn("The {} internal connection point of the {} ecp does not have a VDU", "icpWithoutVdu", "myEcpWithoutIcpWithoutVdu");
+ verify(logger).warn("The {} internal connection point of the {} ecp does not have a requirements section", "icpWithOutRequiements", "myEcpWithoutIcpWithoutIcpReq");
+ verify(logger).warn("The {} internal connection point does not have a VDU", "icpWithOutVdu");
+ verify(logger).warn("The {} internal connection point does not have a requirements section", "icpWithOutRequiements");
+ verify(logger).warn("The {} internal connection point does not have a VL", "icpWithOutVl");
+ verify(logger).warn("The {} type is not converted", "tosca.nodes.nfv.Unknown")*/
+ }
+
+ /**
+ * if a node refers to a non existing node it results in a failure
+ */
+ @Test
+ public void testInconsitentVnfd() {
+ try {
+ packageTransformer.toOnapVnfd(new String(TestUtil.loadFile("unittests/packageconverter/nodes.vnfd.inconsistent.cbam.yaml")));
+ fail();
+ } catch (NoSuchElementException e) {
+ assertEquals("The VNFD does not have a node called myComputeMissing but required by an other node", e.getMessage());
+ }
+ }
+
+}
String expectedOnapVnfd = new OnapVnfdBuilder().toOnapVnfd(cbamVnfd);
//when
- OnapVnfPackageBuilder.main(null);
+ OnapR1VnfPackageBuilder.main(null);
//verify
assertFileInZip(bos.toByteArray(), "TOSCA-Metadata/TOSCA.meta", TestUtil.loadFile("TOSCA.meta"));
assertFileInZip(bos.toByteArray(), "MainServiceTemplate.yaml", expectedOnapVnfd.getBytes());
*/
@Test
public void testPreventMove() {
- assertEquals("b3JnLm9uYXAudmZjLm5mdm8uZHJpdmVyLnZuZm0uc3ZuZm0ubm9raWEucGFja2FnZXRyYW5zZm9ybWVyLk9uYXBWbmZQYWNrYWdlQnVpbGRlcg==", Base64.getEncoder().encodeToString(OnapVnfPackageBuilder.class.getCanonicalName().getBytes()));
+ assertEquals("b3JnLm9uYXAudmZjLm5mdm8uZHJpdmVyLnZuZm0uc3ZuZm0ubm9raWEucGFja2FnZXRyYW5zZm9ybWVyLk9uYXBSMVZuZlBhY2thZ2VCdWlsZGVy", Base64.getEncoder().encodeToString(OnapR1VnfPackageBuilder.class.getCanonicalName().getBytes()));
}
Part part = Mockito.mock(Part.class);
when(part.getInputStream()).thenReturn(new ByteArrayInputStream(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip")));
when(httpRequest.getPart("fileToUpload")).thenReturn(part);
+ Part part2 = Mockito.mock(Part.class);
+ when(httpRequest.getPart("version")).thenReturn(part2);
+ when(part2.getInputStream()).thenReturn(new ByteArrayInputStream("V1".getBytes()));
//when
converterApi.convert(httpResponse, httpRequest);
//verify
public void testUnableToExtractPackageToBeConverted() throws Exception {
IOException expectedException = new IOException();
when(httpRequest.getPart("fileToUpload")).thenThrow(expectedException);
+ Part part = Mockito.mock(Part.class);
+ when(httpRequest.getPart("version")).thenReturn(part);
+ when(part.getInputStream()).thenReturn(new ByteArrayInputStream("V1".getBytes()));
try {
converterApi.convert(httpResponse, httpRequest);
fail();
Part part = Mockito.mock(Part.class);
when(part.getInputStream()).thenReturn(new ByteArrayInputStream(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip")));
when(httpRequest.getPart("fileToUpload")).thenReturn(part);
+
+ Part part2 = Mockito.mock(Part.class);
+ when(httpRequest.getPart("version")).thenReturn(part2);
+ when(part2.getInputStream()).thenReturn(new ByteArrayInputStream("V1".getBytes()));
try {
converterApi.convert(httpResponse, httpRequest);
fail();
Inter inter = new Inter();
inter.start();
//wait for thread to enter waiting
- while(!entered.get() && inter.getState() != Thread.State.TIMED_WAITING && (System.currentTimeMillis() < start + 60*1000) ){
+ while (!entered.get() && inter.getState() != Thread.State.TIMED_WAITING && (System.currentTimeMillis() < start + 60 * 1000)) {
Thread.sleep(10);
}
- if(!(System.currentTimeMillis() < start + 60*1000)){
+ if (!(System.currentTimeMillis() < start + 60 * 1000)) {
throw new RuntimeException("Thread did not enter waiting state");
}
//when
inter.interrupt();
//verify
- while (exceptions.size() != 1 && (System.currentTimeMillis() < start + 60*1000)) {
+ while (exceptions.size() != 1 && (System.currentTimeMillis() < start + 60 * 1000)) {
Thread.sleep(10);
}
assertEquals(1, exceptions.size());
import retrofit2.Call;
import retrofit2.Response;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.*;
import static org.mockito.Mockito.when;
import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.CbamUtils.SEPARATOR;
import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.CatalogManager.getFileInZip;
throw new NoSuchElementException("The " + obj.getClass() + " does not have a filed with " + key + " annotation");
}
+ protected void assertBean(Class<?> clazz) {
+ assertEquals(1, clazz.getDeclaredConstructors().length);
+ Autowired annotation = clazz.getDeclaredConstructors()[0].getAnnotation(Autowired.class);
+ assertNotNull(annotation);
+ assertNotNull(clazz.getAnnotation(Component.class));
+ }
+
public static class VoidObservable {
boolean called = false;
ObservableFromCallable<Void> s = new ObservableFromCallable(new Callable() {
return s;
}
}
-
- protected void assertBean(Class<?> clazz){
- assertEquals(1, clazz.getDeclaredConstructors().length);
- Autowired annotation = clazz.getDeclaredConstructors()[0].getAnnotation(Autowired.class);
- assertNotNull(annotation);
- assertNotNull(clazz.getAnnotation(Component.class));
- }
}
import static junit.framework.TestCase.assertNotNull;
-public class TestCatalogManagerForSo extends TestBase{
+public class TestCatalogManagerForSo extends TestBase {
/**
* Test bean
*/
@Test
- public void testPojo(){
+ public void testPojo() {
SdcPackageProvider sdcPackageProvider = Mockito.mock(SdcPackageProvider.class);
CatalogManagerForSo catalogManagerForSo = new CatalogManagerForSo(cbamRestApiProviderForSo, sdcPackageProvider);
assertNotNull(catalogManagerForSo);
import org.junit.Test;
import org.mockito.Mockito;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.SdcPackageProvider;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcPackageProvider;
import static junit.framework.TestCase.assertNotNull;
-public class TestCatalogManagerForVfc extends TestBase{
+public class TestCatalogManagerForVfc extends TestBase {
/**
* Test bean
*/
@Test
- public void testPojo(){
+ public void testPojo() {
VfcPackageProvider vfcPackageProvider = Mockito.mock(VfcPackageProvider.class);
CatalogManagerForVfc catalogManagerForVfc = new CatalogManagerForVfc(cbamRestApiProviderForVfc, vfcPackageProvider);
assertNotNull(catalogManagerForVfc);
* ETSI configuration extraction from the package
*/
@Test
- public void testEtsiConfigurationDownload() throws Exception{
+ public void testEtsiConfigurationDownload() throws Exception {
//given
byte[] onapPackageContent = TestUtil.loadFile("unittests/TestCbamCatalogManager.sample.csar");
when(packageProvider.getPackage(CSAR_ID)).thenReturn(onapPackageContent);
* ETSI configuration extraction from the package
*/
@Test
- public void testEtsiConfigurationMissing() throws Exception{
+ public void testEtsiConfigurationMissing() throws Exception {
//given
byte[] onapPackageContent = TestUtil.loadFile("unittests/missing.vnfd.zip");
when(packageProvider.getPackage(CSAR_ID)).thenReturn(onapPackageContent);
try {
cbamCatalogManager.getEtsiConfiguration(CSAR_ID);
fail();
- }
- catch (Exception e){
+ } catch (Exception e) {
assertEquals("Unable to download the ETSI configuration file", e.getMessage());
verify(logger).error("Unable to download the ETSI configuration file");
}
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
-public class TestCbamRestApiProviderForSo extends TestBase{
+public class TestCbamRestApiProviderForSo extends TestBase {
@Test
- public void testBean(){
+ public void testBean() {
CbamTokenProviderForSo cbamTokenProvider = Mockito.mock(CbamTokenProviderForSo.class);
AAIExternalSystemInfoProvider aaiExternalSystemInfoProvider = Mockito.mock(AAIExternalSystemInfoProvider.class);
CbamSecurityProvider cbamSecurityProvider = Mockito.mock(CbamSecurityProvider.class);
import junit.framework.TestCase;
import org.junit.Test;
import org.mockito.Mockito;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcExternalSystemInfoProvider;
-public class TestCbamRestApiProviderForVfc extends TestBase{
+public class TestCbamRestApiProviderForVfc extends TestBase {
@Test
- public void testBean(){
+ public void testBean() {
CbamTokenProviderForVfc cbamTokenProvider = Mockito.mock(CbamTokenProviderForVfc.class);
VfcExternalSystemInfoProvider c = Mockito.mock(VfcExternalSystemInfoProvider.class);
CbamSecurityProvider cbamSecurityProvider = Mockito.mock(CbamSecurityProvider.class);
import junit.framework.TestCase;
import org.junit.Test;
-import org.mockito.Mock;
import org.mockito.Mockito;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcExternalSystemInfoProvider;
public class TestCbamTokenProviderForSo extends TestBase {
@Test
- public void testBean(){
+ public void testBean() {
AAIExternalSystemInfoProvider aaiExternalSystemInfoProvider = Mockito.mock(AAIExternalSystemInfoProvider.class);
CbamTokenProviderForSo cbamTokenProviderForSo = new CbamTokenProviderForSo(aaiExternalSystemInfoProvider);
TestCase.assertNotNull(cbamTokenProviderForSo);
import junit.framework.TestCase;
import org.junit.Test;
import org.mockito.Mockito;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.api.VnfmInfoProvider;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcExternalSystemInfoProvider;
public class TestCbamTokenProviderForVfc extends TestBase {
@Test
- public void testBean(){
+ public void testBean() {
VfcExternalSystemInfoProvider vfcExternalSystemInfoProvider = Mockito.mock(VfcExternalSystemInfoProvider.class);
CbamTokenProviderForVfc cbamTokenProviderForVfc = new CbamTokenProviderForVfc(vfcExternalSystemInfoProvider);
TestCase.assertNotNull(cbamTokenProviderForVfc);
public class TestConstants {
@Test
- public void useInStaticWay(){
+ public void useInStaticWay() {
TestUtil.coveragePrivateConstructorForClassesWithStaticMethodsOnly(Constants.class);
}
}
\ No newline at end of file
*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm;
-import junit.framework.TestCase;
import org.junit.Test;
import static junit.framework.TestCase.assertNotNull;
* Test bean
*/
@Test
- public void testPojo(){
+ public void testPojo() {
JobManagerForSo jobManagerForSo = new JobManagerForSo(cbamRestApiProviderForSo, selfRegistrationManagerForSo);
assertNotNull(jobManagerForSo);
assertBean(JobManagerForVfc.class);
* Test bean
*/
@Test
- public void testPojo(){
+ public void testPojo() {
JobManagerForVfc jobManagerForVfc = new JobManagerForVfc(cbamRestApiProviderForVfc, selfRegistrationManagerForVfc);
assertNotNull(jobManagerForVfc);
assertBean(JobManagerForVfc.class);
fail();
} catch (RuntimeException e) {
assertEquals(expectedException, e.getCause().getCause());
- verify(logger).error("Unable to set the externalVnfmId,onapCsarId properties on the VNF with " + VNF_ID +" identifier", expectedException);
+ verify(logger).error("Unable to set the externalVnfmId,onapCsarId properties on the VNF with " + VNF_ID + " identifier", expectedException);
}
}
notificationIsProcessedBeforeDeletingTheVnf.verify(notificationManager).waitForTerminationToBeProcessed("terminationId");
notificationIsProcessedBeforeDeletingTheVnf.verify(vnfApi).vnfsVnfInstanceIdDelete(VNF_ID, NOKIA_LCM_API_VERSION);
}
-
+
/**
* test explicit forceful termination
*/
}
}
- public static class X{
- public Map<String, String> getInputs() {
- return inputs;
- }
-
- public void setInputs(Map<String, String> inputs) {
- this.inputs = inputs;
- }
-
- @SerializedName("inputs")
- public Map<String,String> inputs = new HashMap<String,String>();
-
- public String vimId;
-
- public String properties;
- }
-
private VnfInstantiateRequest prepareInstantiationRequest(VimInfo.VimInfoTypeEnum cloudType, boolean addExtension) {
VnfInstantiateRequest instantiationRequest = new VnfInstantiateRequest();
instantiationRequest.setVnfPackageId(ONAP_CSAR_ID);
image.setVnfdSoftwareImageId("imageId");
additionalParam.getSoftwareImages().add(image);
additionalParam.setAdditionalParams(new JsonParser().parse("{ \"a\" : \"b\" }"));
- if(addExtensions) {
+ if (addExtensions) {
VnfProperty p1 = new VnfProperty();
p1.setName("n1");
p1.setValue(Lists.newArrayList("a", "b"));
assertTrue(actualVim.getInterfaceInfo().isSkipCertificateHostnameCheck());
}
-
/**
* additional params of instantiation may be passed as directly attached artifact
*/
assertTrue(actualVim.getInterfaceInfo().isSkipCertificateHostnameCheck());
verify(logger).info("The instantiation input for VNF with {} CSAR id does not have an " + LifecycleManager.ETSI_CONFIG + " section", ONAP_CSAR_ID);
}
+
+ public static class X {
+ @SerializedName("inputs")
+ public Map<String, String> inputs = new HashMap<String, String>();
+ public String vimId;
+ public String properties;
+
+ public Map<String, String> getInputs() {
+ return inputs;
+ }
+
+ public void setInputs(Map<String, String> inputs) {
+ this.inputs = inputs;
+ }
+ }
}
*/
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm;
-import junit.framework.TestCase;
import org.junit.Test;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.GrantlessGrantManager;
import static junit.framework.TestCase.assertNotNull;
import static org.mockito.Mockito.mock;
-public class TestLifecycleManagerForSo extends TestBase{
+public class TestLifecycleManagerForSo extends TestBase {
/**
* Test bean
*/
@Test
- public void testBean(){
+ public void testBean() {
CatalogManagerForSo catalogManager = mock(CatalogManagerForSo.class);
GrantlessGrantManager grantManager = mock(GrantlessGrantManager.class);
AAIExternalSystemInfoProvider aaiExternalSystemInfoProvider = mock(AAIExternalSystemInfoProvider.class);
package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm;
import org.junit.Test;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.GrantlessGrantManager;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcExternalSystemInfoProvider;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcGrantManager;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.notification.LifecycleChangeNotificationManagerForSo;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.notification.LifecycleChangeNotificationManagerForVfc;
import static junit.framework.TestCase.assertNotNull;
import static org.mockito.Mockito.mock;
-public class TestLifecycleManagerForVfc extends TestBase{
+public class TestLifecycleManagerForVfc extends TestBase {
/**
* Test bean
*/
@Test
- public void testBean(){
+ public void testBean() {
CatalogManagerForVfc catalogManager = mock(CatalogManagerForVfc.class);
VfcGrantManager vfcGrantManager = mock(VfcGrantManager.class);
VfcExternalSystemInfoProvider vfcExternalSystemInfoProvider = mock(VfcExternalSystemInfoProvider.class);
import java.util.Optional;
import java.util.concurrent.*;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.junit.Test;
import org.mockito.Mockito;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.notification.AAINotificationProcessor;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.VfcNotificationSender;
import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.TestBase;
substitution_mappings:
node_type: tosca.nodes.nfv.VNF
properties:
+ descriptor_id: myId
descriptor_version: '1.0'
provider: myProvider
product_name: 'myName'
software_version: '2.0'
- product_info_name: product_info_name
\ No newline at end of file
+ product_info_name: product_info_name
+ capabilities:
+ deployment_flavour:
+ properties:
+ flavour_id: myFlavorId
+ description: myFlavorDescription
\ No newline at end of file
--- /dev/null
+tosca_definitions_version: tosca_simple_profile_yaml_1_1
+
+topology_template:
+ inputs:
+ etsi_config:
+ type: string
+ description: The ETSI configuration
+ node_templates:
+ VNF:
+ type: tosca.nodes.nfv.VNF
+ properties:
+ descriptor_id: myId
+ descriptor_version: 1.0
+ provider: myProvider
+ product_name: myName
+ software_version: 2.0
+ product_info_name: product_info_name
+ vnfm_info: [ NokiaSVNFM ]
+ flavour_id: myFlavorId
+ flavour_description: myFlavorDescription
+ requirements:
substitution_mappings:
node_type: tosca.nodes.nfv.VNF
properties:
+ descriptor_id: Nokia~Maria DB~1.0~1.0
descriptor_version: '1.0'
provider: myProvider
product_name: 'myName'
software_version: '2.0'
product_info_name: product_info_name
+ product_info_description: Relational database, non-scalable
+ capabilities:
+ deployment_flavour:
+ properties:
+ flavour_id: scalableRouted
+ description: flavorDescription
+ vdu_profile:
+ vduNode:
+ min_number_of_instances: 3
+ max_number_of_instances: 11
node_templates:
vduNode:
type: tosca.nodes.nfv.VDU
type: tosca.nodes.nfv.VirtualStorage
properties:
id: myStorage1
- size_of_storage: 1G
+ size_of_storage: 1 GB
myStorage2:
type: tosca.nodes.nfv.VirtualStorage
properties:
id: myStorage2
- size_of_storage: 2G
+ size_of_storage: 2 GB
myNetwork1:
type: tosca.nodes.nfv.VL
+ properties:
+ connectivity_type:
+ layer_protocol: ipv4
+ flow_pattern: mesh
+ description: myDescription
myNetwork2:
type: tosca.nodes.nfv.VL
+ properties:
+ connectivity_type:
+ layer_protocol: ipv4
+ flow_pattern: mesh
+ description: myDescription
icpWithOutEcp:
type: tosca.nodes.nfv.ICP
--- /dev/null
+tosca_definitions_version: tosca_simple_profile_yaml_1_1
+
+topology_template:
+ inputs:
+ etsi_config:
+ type: string
+ description: The ETSI configuration
+ node_templates:
+ VNF:
+ type: tosca.nodes.nfv.VNF
+ properties:
+ descriptor_id: Nokia~Maria DB~1.0~1.0
+ descriptor_version: 1.0
+ provider: myProvider
+ product_name: myName
+ software_version: 2.0
+ product_info_name: product_info_name
+ product_info_description: Relational database, non-scalable
+ vnfm_info: [ NokiaSVNFM ]
+ flavour_id: scalableRouted
+ flavour_description: flavorDescription
+ requirements:
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ node: myNetwork2
+ - virtual_link:
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ node: myNetwork1
+ vduNode:
+ type: tosca.nodes.nfv.Vdu.Compute
+ properties:
+ name: vduNode
+ description: myVduDesc
+ configurable_properties:
+ vdu_profile:
+ min_number_of_instances: 3
+ max_number_of_instances: 11
+ capabilities:
+ virtual_compute:
+ properties:
+ virtual_memory:
+ virtual_mem_size: 8192 MB
+ virtual_cpu:
+ num_virtual_cpu: 4
+ requirements:
+ - virtual_storage:
+ capability: tosca.capabilities.nfv.VirtualStorage
+ node: myStorage1
+ - virtual_storage:
+ capability: tosca.capabilities.nfv.VirtualStorage
+ node: myStorage2
+ myStorage1:
+ type: tosca.nodes.nfv.Vdu.VirtualStorage
+ properties:
+ type_of_storage: volume
+ size_of_storage: 1 GB
+ myStorage2:
+ type: tosca.nodes.nfv.Vdu.VirtualStorage
+ properties:
+ type_of_storage: volume
+ size_of_storage: 2 GB
+ myNetwork1:
+ type: tosca.nodes.nfv.VnfVirtualLink
+ properties:
+ connectivity_type:
+ layer_protocol: [ ipv4 ]
+ flow_pattern: mesh
+ vl_profile:
+ max_bit_rate_requirements:
+ root: 2147483647
+ leaf: 2147483647
+ min_bit_rate_requirements:
+ root: 0
+ leaf: 0
+ myNetwork2:
+ type: tosca.nodes.nfv.VnfVirtualLink
+ properties:
+ connectivity_type:
+ layer_protocol: [ ipv4 ]
+ flow_pattern: mesh
+ vl_profile:
+ max_bit_rate_requirements:
+ root: 2147483647
+ leaf: 2147483647
+ min_bit_rate_requirements:
+ root: 0
+ leaf: 0
+ icpWithOutEcp:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocol: [ ipv4 ]
+ description: myDescription
+ protocol_data: []
+ trunk_mode: false
+ requirements:
+ - virtual_binding: vduNode
+ - virtual_link: myNetwork1
+ icpWithEcp:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocol: [ ipv4 ]
+ description: myDescription
+ protocol_data: []
+ trunk_mode: false
+ requirements:
+ - virtual_binding: vduNode
+ - virtual_link: myNetwork1
+ icpWithOutDescription:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocol: [ ipv4 ]
+ protocol_data: []
+ trunk_mode: false
+ requirements:
+ - virtual_binding: vduNode
+ - virtual_link: myNetwork1
+ myEcp:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocol: [ ipv4 ]
+ protocol_data: [ ]
+ trunk_mode: false
+ description: myDescription
+ requirements:
+ - virtual_binding: vduNode
+ myEcpWithDescription:
+ type: tosca.nodes.nfv.VduCp
+ properties:
+ layer_protocol: [ ipv4 ]
+ protocol_data: [ ]
+ trunk_mode: false
+ requirements:
+ - virtual_binding: vduNode
Code Review / vfc / nfvo / driver / vnfm / svnfm.git / commitdiff