{
- "data_types": {
- "dt-resource-assignment-properties": {
- "description": "Dynamic DataType definition for workflow(resource-assignment).",
- "version": "1.0.0",
- "properties": {
- "vfw_interface_ip": {
- "type": "dt-netbox-ip"
+ "data_types" : {
+ "dt-config-assign-properties" : {
+ "description" : "Dynamic DataType definition for workflow(config-assign).",
+ "version" : "1.0.0",
+ "properties" : {
+ "hostname" : {
+ "type" : "string"
},
- "interface-description": {
- "type": "string"
+ "vfw_interface_ip" : {
+ "type" : "dt-netbox-ip"
},
- "vf-module-type": {
- "type": "string"
+ "interface-name" : {
+ "type" : "string"
},
- "vf-module-number": {
- "type": "string",
- "default": "3"
+ "interface-description" : {
+ "type" : "string"
},
- "prefix-id": {
- "type": "integer",
- "default": 11
+ "unit-number" : {
+ "type" : "string"
+ },
+ "prefix-id" : {
+ "type" : "string",
+ "default" : "6"
+ },
+ "vf-module-type" : {
+ "type" : "string"
+ },
+ "vf-module-number" : {
+ "type" : "string",
+ "default" : "3"
}
},
- "derived_from": "tosca.datatypes.Dynamic"
+ "derived_from" : "tosca.datatypes.Dynamic"
},
- "dt-config-assign-properties": {
- "description": "Dynamic DataType definition for workflow(config-assign).",
- "version": "1.0.0",
- "properties": {
- "hostname": {
- "type": "string"
+ "dt-netbox-ip" : {
+ "description" : "This is Netbox IP Data Type",
+ "version" : "1.0.0",
+ "properties" : {
+ "address" : {
+ "required" : true,
+ "type" : "string"
+ },
+ "id" : {
+ "required" : true,
+ "type" : "integer"
}
},
- "derived_from": "tosca.datatypes.Dynamic"
+ "derived_from" : "tosca.datatypes.Root"
},
- "dt-config-deploy-properties": {
- "description": "Dynamic DataType definition for workflow(config-deploy).",
- "version": "1.0.0",
- "properties": {
- "vfw_interface_ip": {
- "type": "dt-netbox-ip"
- },
- "interface-name": {
- "type": "string"
- },
- "interface-description": {
- "type": "string"
+ "dt-resource-assignment-properties" : {
+ "description" : "Dynamic DataType definition for workflow(resource-assignment).",
+ "version" : "1.0.0",
+ "properties" : {
+ "vfw_interface_ip" : {
+ "type" : "dt-netbox-ip"
},
- "unit-number": {
- "type": "string"
+ "interface-description" : {
+ "type" : "string"
},
- "prefix-id": {
- "type": "string",
- "default": "11"
+ "vf-module-type" : {
+ "type" : "string"
},
- "vf-module-type": {
- "type": "string"
+ "vf-module-number" : {
+ "type" : "string",
+ "default" : "3"
},
- "vf-module-number": {
- "type": "string",
- "default": "3"
+ "prefix-id" : {
+ "type" : "integer",
+ "default" : 6
}
},
- "derived_from": "tosca.datatypes.Dynamic"
+ "derived_from" : "tosca.datatypes.Dynamic"
},
- "dt-rollback-properties": {
- "description": "Dynamic DataType definition for workflow(rollback).",
- "version": "1.0.0",
- "properties": {
- },
- "derived_from": "tosca.datatypes.Dynamic"
- },
- "dt-netbox-ip": {
- "description": "This is Netbox IP Data Type",
- "version": "1.0.0",
- "properties": {
- "address": {
- "required": true,
- "type": "string"
- },
- "id": {
- "required": true,
- "type": "integer"
- }
- },
- "derived_from": "tosca.datatypes.Root"
+ "dt-rollback-properties" : {
+ "description" : "Dynamic DataType definition for workflow(rollback).",
+ "version" : "1.0.0",
+ "properties" : { },
+ "derived_from" : "tosca.datatypes.Dynamic"
}
}
}
\ No newline at end of file
"template_author": "Alexis de Talhouët",
"author-email": "adetalhouet89@gmail.com",
"user-groups": "ADMIN, OPERATION",
- "template_name": "test",
+ "template_name": "golden",
"template_version": "1.0.0",
"template_tags": "test"
},
"dsl_definitions": {
"ipam-1": {
"type": "token-auth",
- "url": "http://localhost:32768",
+ "url": "http://netbox-nginx:8080",
"token": "Token 0123456789abcdef0123456789abcdef01234567"
},
"config-deploy-properties": {
"ip": {
"required": true,
"type": "string"
- },
- "config-deploy-properties": {
- "description": "Dynamic PropertyDefinition for workflow(config-deploy).",
- "required": true,
- "type": "dt-config-deploy-properties"
}
}
},
},
"store-result": true,
"artifact-prefix-names": [
- "hostname"
+ "hostname", "vfw-interface"
]
}
}
"hostname-mapping": {
"type": "artifact-mapping-resource",
"file": "Templates/hostname-mapping.json"
+ },
+ "vfw-interface-template": {
+ "type": "artifact-template-velocity",
+ "file": "Templates/vfw-interface-template.vtl"
+ },
+ "vfw-interface-mapping": {
+ "type": "artifact-mapping-resource",
+ "file": "Templates/vfw-interface-mapping.json"
}
}
},
}
}
}
- },
- "artifacts": {
- "vfw-interface-template": {
- "type": "artifact-template-velocity",
- "file": "Templates/vfw-interface-template.vtl"
- },
- "vfw-interface-mapping": {
- "type": "artifact-mapping-resource",
- "file": "Templates/vfw-interface-mapping.json"
- }
}
},
"rollback": {
CREATE TABLE `demo` (
`id` text DEFAULT NULL,
`value` text DEFAULT NULL
- )
+ );
INSERT INTO `demo` VALUES ('1','vsn'),('2','vpg'),('3','vfw');
resolution-key: To identify the configlet saved in the DB
hostname: Value defined to be result trough input in the hostname mapping file
+ interface-name: Name of the interface to configure
+ unit-number: Unit to configure for the interface
{
"config-assign-request": {
"resolution-key": "config-assign-demo-123",
"config-assign-properties": {
- "hostname": "demo-config-assign"
+ "hostname": "blah"
}
}
}
Output:
- {
- "config-assign-response": {
- "dry-run": {
- "hostname": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<configuration xmlns:junos=\"http://xml.juniper.net/junos/17.4R1/junos\">\n <system xmlns=\"http://yang.juniper.net/junos-qfx/conf/system\">\n <host-name operation=\"delete\" />\n <host-name operation=\"create\">demo-config-assign</host-name>\n </system>\n</configuration>\n"
- }
+ "config-assign-response": {
+ "dry-run": {
+ "hostname": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<configuration xmlns:junos=\"http://xml.juniper.net/junos/17.4R1/junos\">\n <system xmlns=\"http://yang.juniper.net/junos-qfx/conf/system\">\n <host-name operation=\"delete\" />\n <host-name operation=\"create\">blah</host-name>\n </system>\n</configuration>\n",
+ "vfw-interface": "<configuration>\n <interfaces>\n <interface>\n <name>ge-0/0/7</name>\n <unit operation=\"create\">\n <name>0</name>\n <description>This is the Virtual Firewall entity</description>\n <family>\n <inet>\n <address>\n <name>10.0.101.17/24</name>\n </address>\n </inet>\n </family>\n </unit>\n </interface>\n </interfaces>\n</configuration>"
}
}
This action will run a python script that will retrieved the resolved template
from previous step using the resolution-key.
- The script will also resolve another template during its execution: the Interface Template.
- Finally, this action will push these resolved templates into a device (JUNOS) using NETCONF.
+ This action will push these resolved templates into a device (JUNOS) using NETCONF.
The python script will make use of utilities classes provided by the platform:
resolution helper and netconf client.
username: NETCONF device user
password: NETCONF device password
ip: NETCONF device ip
- interface-name: Name of the interface to configure
- unit-number: Unit to configure for the interface
+
{
"config-deploy-request": {
"resolution-key": "config-assign-demo-123",
"username": "admin",
"password": "passwd",
- "ip": "10.198.1.35",
- "config-deploy-properties": {
- "interface-name": "ge-0/0/7",
- "unit-number": "0"
- }
+ "ip": "10.198.1.35"
}
}
Postman collection used for this example. 5 requests are provided one per workflow to execute, and 1 to load the CBA in the runtime environment.
- hhttps://www.getpostman.com/collections/4d199ff02a735bd3e680
\ No newline at end of file
+ https://www.getpostman.com/collections/d68b12a60fd6ed336059
\ No newline at end of file
# Get meshed template from DB
resolution_key = self.getDynamicProperties("resolution-key").asText()
- artifact_name = "hostname"
- payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, artifact_name)
-
- # resolve param and mesh template
- payloadInterface = rr.resolve_and_generate_message_from_template_prefix("vfw-interface")
+ payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, "hostname")
+ payloadInterface = rr.retrieve_resolved_template_from_database(resolution_key, "vfw-interface")
nc.connect()
nc.lock()
"input-param": true,
"property": {
"type": "integer",
- "default": 11
+ "default": 6
},
"dictionary-name": "prefix-id",
"dictionary-source": "default",
"input-param": true,
"property": {
"type": "string",
- "default": "11"
+ "default": "6"
},
"dictionary-name": "prefix-id",
"dictionary-source": "default",
)
val prepareEnvOutput = remoteScriptExecutionService.prepareEnv(prepareEnvInput)
setAttribute(ATTRIBUTE_PREPARE_ENV_LOG, prepareEnvOutput.response.asJsonPrimitive())
+ setAttribute(ATTRIBUTE_EXEC_CMD_LOG, "N/A".asJsonPrimitive())
check(prepareEnvOutput.status == StatusType.SUCCESS) {
"failed to get prepare remote env response status for requestId(${prepareEnvInput.requestId})"
}
log.info("removed cba file name($name), version($version) from deploy location")
// Cleaning Data Base
blueprintModelRepository
- .deleteByArtifactNameAndArtifactVersion(name, version)
+ .deleteByArtifactNameAndArtifactVersion(name, version)
log.info("removed cba file name($name), version($version) from database")
}
val deployFile = normalizedFile(bluePrintPathConfiguration.blueprintDeployPath, name, version)
val cbaFile = normalizedFile(bluePrintPathConfiguration.blueprintArchivePath,
- UUID.randomUUID().toString(), "cba.zip")
+ UUID.randomUUID().toString(), "cba.zip")
if (extract && deployFile.exists()) {
log.info("cba file name($name), version($version) already present(${deployFile.absolutePath})")
blueprintModelRepository.findByArtifactNameAndArtifactVersion(artifactName!!, artifactVersion!!)?.let {
log.info("Overwriting blueprint model :$artifactName::$artifactVersion")
blueprintModelRepository.deleteByArtifactNameAndArtifactVersion(artifactName, artifactVersion)
+ val deployFile =
+ normalizedPathName(bluePrintPathConfiguration.blueprintDeployPath, artifactName, artifactVersion)
+ deleteNBDir(deployFile).let {
+ if (it) log.info("Deleted deployed blueprint model :$artifactName::$artifactVersion")
+ else log.info("Fail to delete deployed blueprint model :$artifactName::$artifactVersion")
+ }
}
val blueprintModel = BlueprintProcessorModel()
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.ObjectMapper
+import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintProperties
"blueprintsprocessor.restclient.ssl.sslKey=src/test/resources/keystore.p12",
"blueprintsprocessor.restclient.ssl.sslKeyPassword=changeit"
])
-
+@Ignore
class BluePrintRestLibPropertyServiceTest {
@Autowired
import kotlinx.coroutines.async
import kotlinx.coroutines.runBlocking
import org.apache.catalina.connector.Connector
+import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.onap.ccsdk.cds.blueprintsprocessor.core.BluePrintProperties
"blueprintsprocessor.restclient.test.sslTrust=src/test/resources/keystore.p12",
"blueprintsprocessor.restclient.test.sslTrustPassword=changeit"
])
+@Ignore
class RestClientServiceTest {
@Autowired
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<tags>
+ <tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
+ <tag>${project.docker.latesttagtimestamp.version}</tag>
</tags>
</build>
</image>
reCreateDirs()
}
-suspend fun deleteNBDir(path: String, vararg more: String?) = withContext(Dispatchers.IO) {
+suspend fun deleteNBDir(path: String, vararg more: String?): Boolean = withContext(Dispatchers.IO) {
normalizedFile(path, *more).deleteRecursively()
}
when {
derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_COMPONENT, true) -> {
- // DO Nothing
+ enhanceStepTargets(name, workflow, firstNodeTemplateName, false)
}
derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW, true) -> {
- enhanceDGStepTargets(name, workflow, firstNodeTemplateName)
+ enhanceStepTargets(name, workflow, firstNodeTemplateName, true)
}
else -> {
throw BluePrintProcessorException("couldn't execute workflow($name) step mapped " +
}
- private fun enhanceDGStepTargets(name: String, workflow: Workflow, dgNodeTemplateName: String) {
+ private fun enhanceStepTargets(name: String, workflow: Workflow, nodeTemplateName: String, isDG: Boolean) {
- val dgNodeTemplate = bluePrintContext.nodeTemplateByName(dgNodeTemplateName)
+ val dependencyNodeTemplates: List<String>
+ if (isDG) {
+ val dgNodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)
- // Get the Dependent Component Node Template Names
- val dependencyNodeTemplateNodes = dgNodeTemplate.properties?.get(PROPERTY_DEPENDENCY_NODE_TEMPLATES)
+ // Get the Dependent Component Node Template Names
+ val dependencyNodeTemplateNodes = dgNodeTemplate.properties?.get(PROPERTY_DEPENDENCY_NODE_TEMPLATES)
?: throw BluePrintException("couldn't get property($PROPERTY_DEPENDENCY_NODE_TEMPLATES) ")
- val dependencyNodeTemplates = JacksonUtils.getListFromJsonNode(dependencyNodeTemplateNodes, String::class.java)
+ dependencyNodeTemplates =
+ JacksonUtils.getListFromJsonNode(dependencyNodeTemplateNodes, String::class.java)
+ } else {
+ dependencyNodeTemplates = listOf(nodeTemplateName)
+ }
log.info("workflow($name) dependent component NodeTemplates($dependencyNodeTemplates)")
Code Review / ccsdk / cds.git / commitdiff