aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cds-ui/client/angular.json3
-rw-r--r--cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html3
-rw-r--r--cds-ui/server/src/controllers/blueprint-rest.controller.ts9
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json8
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl4
-rwxr-xr-xcomponents/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json (renamed from components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json)6
-rwxr-xr-xms/blueprintsprocessor/application/src/main/resources/application-dev.properties4
10 files changed, 24 insertions, 23 deletions
diff --git a/cds-ui/client/angular.json b/cds-ui/client/angular.json
index 96b4df009..c5800f050 100644
--- a/cds-ui/client/angular.json
+++ b/cds-ui/client/angular.json
@@ -30,7 +30,8 @@
"src/styles.scss",
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"./node_modules/material-design-icons/iconfont/material-icons.css",
- "./node_modules/font-awesome/css/font-awesome.css"
+ "./node_modules/font-awesome/css/font-awesome.css",
+ "./node_modules/bootstrap/dist/css/bootstrap.min.css"
],
"scripts": [
"./node_modules/ace-builds/src-min/ace.js",
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html
index ea4c298e8..5a3973a5e 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html
+++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.html
@@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END============================================ -->
-
<div class="containerDiv">
<div class="fileViewContainer">
<!-- <div style="width:inherit; height: inherit; position: fixed;z-index: 1; background-color: rgb(0,0,0);background-color: rgba(0,0,0,0.4);"></div> -->
@@ -46,7 +45,7 @@ limitations under the License.
</mat-tree-node>
</mat-tree>
</div>
- <div class="editorConatiner">
+ <div class="editorConatiner" [ngClass] = "{ 'apply-scrol-to-editor-container' : viewTemplateMode}">
<!-- <i class="fa fa-save save-icon" style="font-size:24px" (click)="updateBlueprint()"></i>
<ace-editor [(text)]="text" [(mode)]="mode" #editor class="aceEditor"></ace-editor> -->
<div class="normal-editor-mode" [ngClass]="{ 'resource-mapping-mode': viewTemplateMode}">
diff --git a/cds-ui/server/src/controllers/blueprint-rest.controller.ts b/cds-ui/server/src/controllers/blueprint-rest.controller.ts
index c630ce060..c1f7f9640 100644
--- a/cds-ui/server/src/controllers/blueprint-rest.controller.ts
+++ b/cds-ui/server/src/controllers/blueprint-rest.controller.ts
@@ -135,14 +135,15 @@ export class BlueprintRestController {
});
}
- @get('/download-blueprint/{id}')
+ @get('/download-blueprint/{name}/{version}')
async download(
- @param.path.string('id') id: string,
- @inject(RestBindings.Http.REQUEST) request: Request,
+ @param.path.string('name') name: string,
+ @param.path.string('version') version:string,
+ // @inject(RestBindings.Http.REQUEST) request: Request,
@inject(RestBindings.Http.RESPONSE) response: Response,
): Promise<any> {
return new Promise((resolve, reject) => {
- this.downloadFileFromBlueprintController("/blueprint-model/download/" + id).then(resp=>{
+ this.downloadFileFromBlueprintController("/blueprint-model/download/by-name/"+name+"/version/"+version).then(resp=>{
response.setHeader("X-ONAP-RequestID", resp.headers['x-onap-requestid']);
response.setHeader("Content-Disposition", resp.headers['content-disposition']);
resolve(resp.body);
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
index 536295ef7..d87b8d1f1 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
@@ -1,11 +1,11 @@
[
{
- "name": "nf-id",
+ "name": "pnf-id",
"input-param": true,
"property": {
"type": "string"
},
- "dictionary-name": "nf-id",
+ "dictionary-name": "pnf-id",
"dictionary-source": "input",
"dependencies": [
]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
index e94bb0f6b..a0804bb3f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
@@ -13,7 +13,7 @@
"pnf-ipv4-address" : {
"type" : "string"
},
- "nf-id" : {
+ "pnf-id" : {
"type" : "string"
}
},
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
index 01532769b..114eb1992 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
@@ -1,9 +1,9 @@
{
- "nf-id" : {
- "tags" : "nf-id",
- "name" : "nf-id",
+ "pnf-id" : {
+ "tags" : "pnf-id",
+ "name" : "pnf-id",
"property" : {
- "description" : "nf-id",
+ "description" : "pnf-id",
"type" : "string"
},
"updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py
index 2402c5b1a..d65aefabb 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py
@@ -67,9 +67,9 @@ class RestconfConfigDeploy(RestconfComponentFunction):
def retrieve_parameters(self, execution_request):
resolution_key = self.getDynamicProperties("resolution-key").asText()
self.log.info("resolution_key: {}", resolution_key)
- pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("nf-id")
+ pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("pnf-id")
pnf_id = str(pnf_id).strip('\"')
- self.log.info("nf-id: {}", pnf_id)
+ self.log.info("pnf-id: {}", pnf_id)
return pnf_id, resolution_key
def recover(self, runtime_exception, execution_request):
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
index caad02bce..ad03321af 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
@@ -1,7 +1,7 @@
<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
- <node-id>$nf-id</node-id>
+ <node-id>$pnf-id</node-id>
<key-based xmlns="urn:opendaylight:netconf-node-topology">
- <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL-private-key</key-id>
+ <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL_private_key_0</key-id>
<username xmlns="urn:opendaylight:netconf-node-topology">netconf</username>
</key-based>
<host xmlns="urn:opendaylight:netconf-node-topology">$pnf-ipv4-address</host>
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
index a140a442f..32468533a 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
@@ -1,9 +1,9 @@
{
- "name" : "nf-id",
- "tags" : "nf-id",
+ "name" : "pnf-id",
+ "tags" : "pnf-id",
"updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
"property" : {
- "description" : "nf-id",
+ "description" : "pnf-id",
"type" : "string"
},
"sources" : {
diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
index fc148bf49..0e2cdf9de 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
@@ -18,10 +18,10 @@
#logging.level.web=DEBUG
# Web server config
-server.port=8080
+server.port=8081
blueprintsprocessor.grpcEnable=false
-blueprintsprocessor.httpPort=8080
+blueprintsprocessor.httpPort=8081
blueprintsprocessor.grpcPort=9111
# Blueprint Processor File Execution and Handling Properties