diff options
32 files changed, 3655 insertions, 2415 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html index dc363b28a..776533845 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/package-creation.component.html @@ -167,7 +167,7 @@ aria-labelledby="nav-authentication-tab">... </div> <div class="tab-pane fade" id="nav-template" role="tabpanel" - aria-labelledby="nav-template-tab">... + aria-labelledby="nav-template-tab"><app-template-mapping></app-template-mapping> </div> <div class="tab-pane fade" id="nav-scripts" role="tabpanel" aria-labelledby="nav-scripts-tab">... diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.css b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.css new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.css diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.html new file mode 100644 index 000000000..c21bae3af --- /dev/null +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.html @@ -0,0 +1,100 @@ +<h6 class="create-title">CREATE</h6> +<div class="card creat-card"> + <div class="single-line"> + <label class="label-name">Name</label> + <div class="label-input"> + <input type="input" (input)="searchPackages($event)" [(ngModel)]="metaDataTab.name" + placeholder="Topology name.vLB.CDS"> + </div> + </div> + <hr /> + <div class="single-line"> + <label class="label-name">Management Type</label> + <div class="label-input"> + <div class="row"> + <div class="col-md-4 d-flex"> + <a class="select-type active" href="#"> + <div class="select-type-icon"><span class="icon-template-mapping"></span></div> + <div>Template And Support Mapping</div> + </a> + </div> + <div class="col-md-4 d-flex"> + <a class="select-type" href="#"> + <div class="select-type-icon"><span class="icon-template"></span></div> + <div>Template Only</div> + </a> + </div> + <div class="col-md-4 d-flex"> + <a class="select-type" href="#"> + <div class="select-type-icon"><span class="icon-mapping"></span></div> + <div>Mapping Only</div> + </a> + + </div> + </div> + + </div> + </div> + <hr /> + <div class="single-line"> + <label class="label-name">Type</label> + <div class="label-input"> + <label name="trst"> + <input class="form-check-input" type="radio" name="exampleRadios" id="exampleRadios1" value=Velcoity> + + <span> + Velcoity + </span> + </label> + <label name="trst"> + <input class="form-check-input" type="radio" name="exampleRadios" id="exampleRadios1" value=Velcoity> + + <span> + Jinja + </span> + </label> + <label name="trst"> + <input class="form-check-input" type="radio" name="exampleRadios" id="exampleRadios1" value=Velcoity> + + <span> + Kotlin + </span> + </label> + </div> + </div> +</div> + +<div class="template-mapping-accordion"> +<div id="accordion"> + <div class="card"> + <div class="card-header" id="headingOne"> + <h5 class="mb-0 d-flex justify-content-between"> + <button class="btn btn-link" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> + 1. Create Template + </button> + + </h5> + </div> + + <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion"> + <div class="card-body"> + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. + </div> + </div> + </div> + <div class="card"> + <div class="card-header" id="headingTwo"> + <h5 class="mb-0"> + <button class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo"> + 2. Manage Mapping + </button> + </h5> + </div> + <div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordion"> + <div class="card-body"> + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS. + </div> + </div> + </div> + </div> +</div>
\ No newline at end of file diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.spec.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.spec.ts new file mode 100644 index 000000000..dc31bae85 --- /dev/null +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TemplateMappingComponent } from './template-mapping.component'; + +describe('TemplateMappingComponent', () => { + let component: TemplateMappingComponent; + let fixture: ComponentFixture<TemplateMappingComponent>; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TemplateMappingComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TemplateMappingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.ts new file mode 100644 index 000000000..6615a2d2c --- /dev/null +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/package-creation/template-mapping/template-mapping.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-template-mapping', + templateUrl: './template-mapping.component.html', + styleUrls: ['./template-mapping.component.css'] +}) +export class TemplateMappingComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.module.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.module.ts index 3bd2019ad..a83f6eca3 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.module.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/packages.module.ts @@ -20,6 +20,7 @@ import {PackageCreationComponent} from './package-creation/package-creation.comp import {FormsModule} from '@angular/forms'; import { ImportsTabComponent } from './package-creation/imports-tab/imports-tab.component'; import { NgxFileDropModule } from 'ngx-file-drop'; +import { TemplateMappingComponent } from './package-creation/template-mapping/template-mapping.component'; @NgModule({ declarations: [PackagesDashboardComponent, @@ -35,6 +36,7 @@ import { NgxFileDropModule } from 'ngx-file-drop'; ActionsComponent, PackageCreationComponent, ImportsTabComponent, + TemplateMappingComponent, ], imports: [ CommonModule, diff --git a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.eot b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.eot Binary files differindex 0022fbff6..b04c6c41e 100755 --- a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.eot +++ b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.eot diff --git a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.svg b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.svg index f30402d39..22693eb7a 100755 --- a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.svg +++ b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.svg @@ -14,4 +14,8 @@ <glyph unicode="" glyph-name="archive" d="M945.238 644.924h-866.463c-10.674 0-19.905-3.895-27.697-11.691-7.796-7.792-11.691-17.024-11.691-27.691v-590.772c0-10.665 3.895-19.901 11.691-27.691 7.792-7.796 17.024-11.7 27.697-11.7h866.463c10.667 0 19.893 3.904 27.691 11.7 7.79 7.788 11.685 17.024 11.685 27.691v590.772c0 10.674-3.88 19.897-11.685 27.691-7.79 7.796-17.024 11.691-27.691 11.691zM618.454 459.694c-7.788-7.794-17.024-11.691-27.691-11.691h-157.539c-10.661 0-19.893 3.899-27.691 11.691-7.792 7.796-11.691 17.024-11.691 27.697 0 10.665 3.899 19.897 11.691 27.691 7.796 7.796 17.028 11.695 27.691 11.695h157.554c10.659 0 19.888-3.899 27.691-11.695 7.79-7.792 11.685-17.024 11.685-27.691 0-10.672-3.904-19.901-11.7-27.697zM1012.32 908.927c-7.798 7.796-17.024 11.691-27.693 11.691h-945.242c-10.665 0-19.897-3.895-27.691-11.691-7.794-7.792-11.693-17.024-11.693-27.691v-157.539c0-10.665 3.899-19.893 11.695-27.691 7.794-7.796 17.024-11.691 27.691-11.691h945.227c10.665 0 19.901 3.895 27.706 11.691 7.788 7.796 11.682 17.024 11.682 27.691v157.539c0 10.674-3.895 19.899-11.682 27.691z" /> <glyph unicode="" glyph-name="enter" d="M677.571 437.241h-644.248c-18.395 0-33.323 14.929-33.323 33.323s14.929 33.323 33.323 33.323h644.248c18.395 0 33.323-14.929 33.323-33.323s-14.929-33.323-33.323-33.323zM499.849 259.519c-8.534 0-17.060 3.238-23.552 9.771-13.017 13.017-13.017 34.121 0 47.146l154.177 154.169-154.177 154.177c-13.017 13.017-13.017 34.129 0 47.146 13.025 13.017 34.129 13.017 47.146 0l177.722-177.73c13.017-13.017 13.017-34.121 0-47.137l-177.722-177.722c-6.533-6.582-15.059-9.82-23.593-9.82v0zM533.173-18.18c-202.21 0-380.728 121.651-454.884 309.957-6.753 17.060 1.684 36.431 18.793 43.184 17.060 6.663 36.48-1.643 43.232-18.842 64.027-162.573 218.245-267.652 392.859-267.652 232.726 0 422.098 189.372 422.098 422.098s-189.372 422.098-422.098 422.098c-174.614 0-328.832-105.079-392.859-267.652-6.801-17.199-26.172-25.505-43.232-18.842-17.109 6.753-25.546 26.123-18.793 43.184 74.156 188.306 252.675 309.957 454.884 309.957 269.475 0 488.744-219.27 488.744-488.744s-219.27-488.744-488.744-488.744z" /> <glyph unicode="" glyph-name="file-code" horiz-adv-x="768" d="M512 960h-512v-1024h768v768l-256 256zM448 640h256v-640h-640v896h384v-256zM512 704v192l192-192h-192zM268.8 128h-44.8l-128 160 128 160h44.8l-128-160zM499.2 128h44.8l128 160-128 160h-44.8l128-160zM300.8 64h38.4l134.4 448h-51.2z" /> +<glyph unicode="" glyph-name="drag-menu" horiz-adv-x="372" d="M169.256 845.363c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546zM169.256 591.728c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546zM169.256 338.091c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546zM169.256 84.455c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546zM372.165 845.363c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546zM372.165 591.728c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546zM372.165 338.091c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546zM372.165 84.455c0-46.693-37.852-84.546-84.546-84.546s-84.546 37.852-84.546 84.546c0 46.693 37.852 84.546 84.546 84.546s84.546-37.852 84.546-84.546z" /> +<glyph unicode="" glyph-name="mapping" horiz-adv-x="1698" d="M439.686 447.811c0 118.806-96.658 215.464-215.464 215.464s-215.464-96.658-215.464-215.464c0-118.806 96.658-215.464 215.464-215.464s215.464 96.658 215.464 215.464zM224.222 293.908c-84.863 0-153.903 69.040-153.903 153.903s69.040 153.903 153.903 153.903c84.863 0 153.903-69.040 153.903-153.903s-69.040-153.903-153.903-153.903zM612.057 878.739c16.965 0 30.781 13.815 30.781 30.781 0 16.989-13.815 30.781-30.781 30.781s-30.781-13.791-30.781-30.781c0-16.965 13.815-30.781 30.781-30.781zM488.935 940.3h-169.293c-8.092 0-16.040-3.294-21.763-9.018s-9.018-13.671-9.018-21.763v-147.747c0-16.965 13.815-30.781 30.781-30.781s30.781 13.815 30.781 30.781v116.966h138.513c16.965 0 30.781 13.815 30.781 30.781s-13.815 30.781-30.781 30.781zM612.057 16.883c-16.965 0-30.781-13.815-30.781-30.781s13.815-30.781 30.781-30.781c16.965 0 30.781 13.815 30.781 30.781s-13.815 30.781-30.781 30.781zM488.935 16.883h-138.513v116.966c0 16.965-13.815 30.781-30.781 30.781s-30.781-13.815-30.781-30.781v-147.747c0-8.092 3.294-16.040 9.018-21.763s13.671-9.018 21.763-9.018h169.293c16.965 0 30.781 13.815 30.781 30.781s-13.815 30.781-30.781 30.781zM1129.404 550.103c-13.736 14.479-36.54 15.296-51.275 1.83l-117.198-111.703-49.442 51.275c-13.736 14.479-36.54 15.293-51.275 1.83-14.185-14.861-14.185-38.244 0-53.105l75.078-76.911c6.498-7.276 15.885-11.3 25.636-10.988 9.66 0.137 18.875 4.087 25.636 10.988l142.834 135.509c14.16 12.99 15.107 35.001 2.114 49.158-0.666 0.74-1.37 1.444-2.107 2.117zM1654.962 471.362h-421.178c-20.228 0-36.624-16.397-36.624-36.624s16.397-36.624 36.624-36.624h421.178c20.228 0 36.624 16.397 36.624 36.624s-16.397 36.624-36.624 36.624zM1129.404 843.097c-13.736 14.479-36.54 15.296-51.275 1.83l-117.198-111.703-49.442 51.275c-13.736 14.479-36.54 15.296-51.275 1.83-14.185-14.861-14.185-38.244 0-53.105l75.078-76.911c6.498-7.276 15.885-11.3 25.636-10.988 9.66 0.137 18.875 4.087 25.636 10.988l142.834 135.509c14.16 12.99 15.107 35.001 2.114 49.158-0.666 0.74-1.37 1.444-2.107 2.117zM1654.962 764.356h-421.178c-20.228 0-36.624-16.397-36.624-36.624s16.397-36.624 36.624-36.624h421.178c20.228 0 36.624 16.397 36.624 36.624s-16.397 36.624-36.624 36.624zM1129.404 257.112c-13.736 14.479-36.54 15.293-51.275 1.83l-117.198-111.703-49.442 51.275c-13.736 14.479-36.54 15.293-51.275 1.83-14.185-14.861-14.185-38.244 0-53.105l75.078-76.911c6.498-7.276 15.885-11.3 25.636-10.988 9.66 0.137 18.875 4.087 25.636 10.988l142.834 135.509c14.16 12.99 15.107 35.001 2.114 49.158-0.666 0.736-1.37 1.441-2.107 2.117zM1654.962 178.368h-421.178c-20.228 0-36.624-16.397-36.624-36.624s16.397-36.624 36.624-36.624h421.178c20.228 0 36.624 16.397 36.624 36.624s-16.397 36.624-36.624 36.624z" /> +<glyph unicode="" glyph-name="template-mapping" horiz-adv-x="1843" d="M872 448c0-66.273-53.727-120-120-120s-120 53.727-120 120c0 66.273 53.727 120 120 120s120-53.727 120-120zM892 448c0 77.195-62.805 140-140 140s-140-62.805-140-140c0-77.195 62.805-140 140-140s140 62.805 140 140zM752 348c-55.141 0-100 44.859-100 100s44.859 100 100 100c55.141 0 100-44.859 100-100s-44.859-100-100-100zM252 960h-232c-11.047 0-20-8.953-20-20v-232c0-11.047 8.953-20 20-20h232c11.047 0 20 8.953 20 20v232c0 11.047-8.953 20-20 20zM232 728h-192v192h192v-192zM252 208h-232c-11.047 0-20-8.953-20-20v-232c0-11.047 8.953-20 20-20h232c11.047 0 20 8.953 20 20v232c0 11.047-8.953 20-20 20zM232-24h-192v192h192v-192zM252 584h-232c-11.047 0-20-8.953-20-20v-232c0-11.047 8.953-20 20-20h232c11.047 0 20 8.953 20 20v232c0 11.047-8.953 20-20 20zM232 352h-192v192h192v-192zM332 428h140l-32-24c-8.836-6.625-10.625-19.164-4-28 3.93-5.234 9.938-8 16.016-8 4.18 0 8.383 1.305 11.984 4l80 60c0.102 0.070 8 6 8 16 0 6.172-3.039 12.305-8 16l-80 60c-8.836 6.633-21.375 4.836-28-4s-4.836-21.375 4-28l32-24h-140c-11.047 0-20-8.953-20-20s8.953-20 20-20zM332 804h169.711l140-140h-49.711c-11.047 0-20-8.953-20-20s8.953-20 20-20h100c12.82 0 22.789 13.312 19.203 25.602l-28 96c-3.094 10.602-14.203 16.703-24.805 13.602-10.602-3.094-16.688-14.195-13.594-24.805l6.961-23.875-127.625 127.625c-3.75 3.742-8.836 5.852-14.141 5.852h-178c-11.047 0-20-8.953-20-20s8.953-20 20-20zM692 268h-100c-11.047 0-20-8.953-20-20s8.953-20 20-20h49.711l-140-140h-169.711c-11.047 0-20-8.953-20-20s8.953-20 20-20h178c5.305 0 10.391 2.109 14.141 5.859l127.625 127.625-6.969-23.883c-3.094-10.609 3-21.711 13.602-24.797 1.875-0.547 3.758-0.813 5.609-0.813 8.664 0 16.641 5.68 19.195 14.406 0 0 27.867 95.562 28 96 3.578 12.297-6.437 25.602-19.203 25.602v0zM1004 728c11.023 0 20 8.977 20 20 0 11.039-8.977 20-20 20s-20-8.961-20-20c0-11.023 8.977-20 20-20zM924 768h-110c-5.258 0-10.422-2.141-14.141-5.859s-5.859-8.883-5.859-14.141v-96c0-11.023 8.977-20 20-20s20 8.977 20 20v76h90c11.023 0 20 8.977 20 20s-8.977 20-20 20zM1004 168c-11.023 0-20-8.977-20-20s8.977-20 20-20c11.023 0 20 8.977 20 20s-8.977 20-20 20zM924 168h-90v76c0 11.023-8.977 20-20 20s-20-8.977-20-20v-96c0-5.258 2.141-10.422 5.859-14.141s8.883-5.859 14.141-5.859h110c11.023 0 20 8.977 20 20s-8.977 20-20 20zM1387.759 524.215c-11.101 11.702-29.53 12.362-41.439 1.479l-94.715-90.273-39.957 41.439c-11.101 11.702-29.53 12.359-41.439 1.479-11.464-12.010-11.464-30.907 0-42.917l60.675-62.157c5.252-5.881 12.838-9.132 20.718-8.88 7.807 0.11 15.254 3.303 20.718 8.88l115.433 109.513c11.444 10.498 12.209 28.287 1.708 39.728-0.538 0.598-1.108 1.167-1.702 1.711zM1812.494 460.58h-340.379c-16.347 0-29.598-13.251-29.598-29.598s13.251-29.598 29.598-29.598h340.379c16.347 0 29.598 13.251 29.598 29.598s-13.251 29.598-29.598 29.598zM1387.759 761.001c-11.101 11.702-29.53 12.362-41.439 1.479l-94.715-90.273-39.957 41.439c-11.101 11.702-29.53 12.362-41.439 1.479-11.464-12.010-11.464-30.907 0-42.917l60.675-62.157c5.252-5.881 12.838-9.132 20.718-8.88 7.807 0.11 15.254 3.303 20.718 8.88l115.433 109.513c11.444 10.498 12.209 28.287 1.708 39.728-0.538 0.598-1.108 1.167-1.702 1.711zM1812.494 697.366h-340.379c-16.347 0-29.598-13.251-29.598-29.598s13.251-29.598 29.598-29.598h340.379c16.347 0 29.598 13.251 29.598 29.598s-13.251 29.598-29.598 29.598zM1387.759 287.432c-11.101 11.702-29.53 12.359-41.439 1.479l-94.715-90.273-39.957 41.439c-11.101 11.702-29.53 12.359-41.439 1.479-11.464-12.010-11.464-30.907 0-42.917l60.675-62.157c5.252-5.881 12.838-9.132 20.718-8.88 7.807 0.11 15.254 3.303 20.718 8.88l115.433 109.513c11.444 10.498 12.209 28.287 1.708 39.728-0.538 0.595-1.108 1.164-1.702 1.711zM1812.494 223.794h-340.379c-16.347 0-29.598-13.251-29.598-29.598s13.251-29.598 29.598-29.598h340.379c16.347 0 29.598 13.251 29.598 29.598s-13.251 29.598-29.598 29.598z" /> +<glyph unicode="" glyph-name="template" horiz-adv-x="1109" d="M253.953 960h-233.798c-11.133 0-20.155-9.023-20.155-20.155v-233.798c0-11.133 9.023-20.155 20.155-20.155h233.798c11.133 0 20.155 9.023 20.155 20.155v233.798c0 11.133-9.023 20.155-20.155 20.155zM233.798 726.202h-193.488v193.488h193.488v-193.488zM1054.115 856.806h-518.829c-24.917 0-45.116-13.354-45.116-29.828s20.198-29.828 45.116-29.828h518.829c24.917 0 45.116 13.354 45.116 29.828s-20.198 29.828-45.116 29.828zM253.953 573.023h-233.798c-11.133 0-20.155-9.023-20.155-20.155v-233.798c0-11.133 9.023-20.155 20.155-20.155h233.798c11.133 0 20.155 9.023 20.155 20.155v233.798c0 11.133-9.023 20.155-20.155 20.155zM233.798 339.225h-193.488v193.488h193.488v-193.488zM1054.115 469.829h-518.829c-24.917 0-45.116-13.354-45.116-29.828s20.198-29.828 45.116-29.828h518.829c24.917 0 45.116 13.354 45.116 29.828s-20.198 29.828-45.116 29.828zM253.953 211.845h-233.798c-11.133 0-20.155-9.023-20.155-20.155v-233.798c0-11.133 9.023-20.155 20.155-20.155h233.798c11.133 0 20.155 9.023 20.155 20.155v233.798c0 11.133-9.023 20.155-20.155 20.155zM233.798-21.953h-193.488v193.488h193.488v-193.488zM1054.115 108.651h-518.829c-24.917 0-45.116-13.354-45.116-29.828s20.198-29.828 45.116-29.828h518.829c24.917 0 45.116 13.354 45.116 29.828s-20.198 29.828-45.116 29.828z" /> </font></defs></svg>
\ No newline at end of file diff --git a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.ttf b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.ttf Binary files differindex f16e62216..1f3af3988 100755 --- a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.ttf +++ b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.ttf diff --git a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.woff b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.woff Binary files differindex a763911c0..e5f2266d2 100755 --- a/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.woff +++ b/cds-ui/designer-client/src/assets/icomoon/fonts/icomoon.woff diff --git a/cds-ui/designer-client/src/assets/icomoon/style.css b/cds-ui/designer-client/src/assets/icomoon/style.css index f48119ce8..6294f3088 100755 --- a/cds-ui/designer-client/src/assets/icomoon/style.css +++ b/cds-ui/designer-client/src/assets/icomoon/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?wg9fpe'); - src: url('fonts/icomoon.eot?wg9fpe#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?wg9fpe') format('truetype'), - url('fonts/icomoon.woff?wg9fpe') format('woff'), - url('fonts/icomoon.svg?wg9fpe#icomoon') format('svg'); + src: url('fonts/icomoon.eot?3g19qh'); + src: url('fonts/icomoon.eot?3g19qh#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?3g19qh') format('truetype'), + url('fonts/icomoon.woff?3g19qh') format('woff'), + url('fonts/icomoon.svg?3g19qh#icomoon') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -25,6 +25,18 @@ -moz-osx-font-smoothing: grayscale; } +.icon-mapping:before { + content: "\e908"; +} +.icon-template-mapping:before { + content: "\e909"; +} +.icon-template:before { + content: "\e90a"; +} +.icon-drag-menu:before { + content: "\e907"; +} .icon-file-code:before { content: "\e906"; } diff --git a/cds-ui/designer-client/src/styles.css b/cds-ui/designer-client/src/styles.css index 17c49ce48..91bc3f9ad 100644 --- a/cds-ui/designer-client/src/styles.css +++ b/cds-ui/designer-client/src/styles.css @@ -9,6 +9,7 @@ body{ /* font-family: 'Nunito' !important; */ font-family: Arial, Helvetica, sans-serif !important; color: #1B3E6F !important; + font-size: 14px; } *:focus{ outline: none; @@ -250,7 +251,7 @@ background-color: #333; .import-container{ width: 100%; background: #E0E8F2; - padding:30px ; + padding:25px ; } .import-container-input{ width: 40%; @@ -264,8 +265,9 @@ background-color: #333; padding: 5px 20px; border: 0px; -webkit-box-shadow: 0px 0px 42px -27px rgba(0,0,0,0.75); - -moz-box-shadow: 0px 0px 42px -27px rgba(0,0,0,0.75); - box-shadow: 0px 0px 42px -27px rgba(0,0,0,0.75); +-moz-box-shadow: 0px 0px 42px -27px rgba(0,0,0,0.75); +box-shadow: 0px 0px 42px -27px rgba(0,0,0,0.75); +font-size: 13px; } .enter-link{ position: absolute; @@ -283,11 +285,6 @@ background-color: #333; .import-container-span{ font-size: 12px; } -.accordion .card{ - margin-bottom: 0px !important; - background-color: #FAFAFA !important; - border: 0px; -} .accordion-delete{ color: #FF6469; font-size: 18px; @@ -296,9 +293,6 @@ background-color: #333; .accordion-delete:hover{ text-decoration: none; } -.card-header{ - background-color: #DEE8F3 !important; -} /* .userProfile .dropdown-toggle{ height: 40px; } */ @@ -1448,16 +1442,16 @@ ul.package-contributers{ margin-bottom: -16px; } .btn{ - padding-right: 20px !important; - padding-left: 20px !important; - +padding-right: 20px !important; +padding-left: 20px !important; + } .btn.border-radius{ border-radius: 20px !important; } .btn-primary{ - background-color: #1273EB !important; - border-color: #1273EB !important; + background-color: #1273EB !important; + border-color: #1273EB !important; } .btn-primary:hover { background-color: #0069d9 !important; @@ -1465,7 +1459,7 @@ ul.package-contributers{ } .btn + .btn{ margin-left: 10px; -} + } .card.creat-card{ margin: 0; border-radius: 2px; @@ -1473,35 +1467,37 @@ ul.package-contributers{ box-shadow: 0 2px 6px 0 rgba(47, 83, 151, 0.1); } .card.creat-card .single-line{ - padding: 15px 70px 15px; + padding: 15px 25px 15px; } .single-line label{ margin-bottom: 0px; -} -.label-name{ - width: 300px; - display: inline-block; - margin-bottom: 0px; -} -.delete-key{ - color: #FF6469; - font-size: 10px; - background: #FFE6E7; - border: 1px solid #FFC9CB; - padding: 3px 10px 2px; - margin-left: 10px; - border-radius: 5px; -} -.delete-key:hover{ - color: #C94448; - background: #FFC9CB; - border: 1px solid #FF6469; - text-decoration: none; -} -.label-input{ - width: calc(100% - 300px); - display: inline-block; -} + } + .label-name{ + width: 300px; + display: inline-block; + margin-bottom: 0px; + font-size: 14px; + font-weight: bold; + } + .delete-key{ + color: #FF6469; + font-size: 10px; + background: #FFE6E7; + border: 1px solid #FFC9CB; + padding: 3px 10px 2px; + margin-left: 10px; + border-radius: 5px; + } + .delete-key:hover{ + color: #C94448; + background: #FFC9CB; + border: 1px solid #FF6469; + text-decoration: none; + } + .label-input{ + width: calc(100% - 300px); + display: inline-block; + } .form-check-input{ margin-left: 0px !important; margin-top: 2px !important; @@ -1509,44 +1505,55 @@ ul.package-contributers{ .form-check-input+span{ margin-left: 20px; margin-right: 50px; -} -.label-input input{ - margin-bottom: 0px; - outline: 0px; - border: 0px; - font-size: 12px; - width: 100%; -} -.single-line select{ - margin-bottom: 0px; - outline: 0px; - border: 0px; - background: none; - background: url(/assets/img/arrow.svg) center right no-repeat; - background-size: 10spx; - width: 100%; - -webkit-appearance: none; - -moz-appearance: none; - text-indent: 1px; - text-overflow: ''; - -} -.single-line select option:first-child{ - color: #C3CDDB; -} -.single-line input::placeholder{ font-size: 14px; - color: #C3CDDB; -} -.single-line .custom-key{ - background: none; - border: 0px; - color:#1273EB ; - font-size: 15px; -} -.single-line .custom-key:focus{ - outline: none; } + .label-input input{ + margin-bottom: 0px; + outline: 0px; + border: 0px; + font-size: 14px; + width: 100%; + } + .label-input input[type=radio]{ + width: auto; + + } + .label-input input[type=radio]+span{ + font-size: 12px; + display: block; + margin-right: 100px; + } + .single-line select{ + margin-bottom: 0px; + outline: 0px; + border: 0px; + background: none; + background: url(/assets/img/arrow.svg) center right no-repeat; + background-size: 10spx; + width: 100%; + -webkit-appearance: none; + -moz-appearance: none; + text-indent: 1px; + text-overflow: ''; + font-size: 14px; + + } + .single-line select option:first-child{ + color: #C3CDDB; + } + .single-line input::placeholder{ + font-size: 14px; + color: #C3CDDB; + } + .single-line .custom-key{ + background: none; + border: 0px; + color:#1273EB ; + font-size: 15px; + } + .single-line .custom-key:focus{ + outline: none; + } .creat-container{ padding:70px 100px 70px 70px; position: relative; @@ -1609,7 +1616,7 @@ hr { content: "\f105"; font-family:'FontAwesome'; position: relative; - margin-right: 30px; + margin-right: 25px; } .btn-link i{ margin-right: 10px; @@ -1631,13 +1638,19 @@ hr { display: inline-block; text-align: center; } +.btn-group-sm>.btn, .btn-sm{ + font-size: 12px; +} +.create-title{ + font-size: 14px; +} .folder-upload-text{ margin-top: 10px; width: 100%; display: inline-block; text-align: center; color:#242424 ; - font-size: 12px; + font-size: 14px; } .folder-upload-text button{ margin-left: 10px; @@ -1669,6 +1682,176 @@ hr { top: 11px; color: #66BB00; } +.authentication-container-all{ + background: #F4F9FE; + border:1px solid #D0DFF1 ; + flex: 1; + width: 100%; +} +.authentication-header{ + width: 100%; + background: #fff; + font-size: 12px; + color: #C3CDDB; + font-weight: bold; + padding: 10px 20px ; +} +.authentication-search{ + width: 100%; + background: #fff; + font-size: 12px; + color: #C3CDDB; + font-weight: bold; + position: relative; +} +.authentication-search::after{ + content: "\f002"; + font-family: 'FontAwesome'; + position: absolute; + left: 20px; + top: 11px; +} +.authentication-search input{ + width: 100%; + background: #fff; + font-size: 12px; + color: #C3CDDB; + font-weight: bold; + padding: 10px 20px 10px 35px; + border: 0px; + border-top: 1px solid #D7E7F9; +} +.authentication-search input::placeholder{ + color: #D0D7E4; + font-size: 10px; + font-weight:100; +} +.authentication-accordion{ + width: 100%; + padding: 20px; + max-height: 300px; + overflow: auto; +} +.authentication-accordion .card{ + border-radius: 0px !important; + margin-bottom: 10px !important; +} +.authentication-accordion .card-header{ + padding: 0px !important; + background: #fff !important; + border-radius: 0px !important; + font-size: 18px; + font-weight: bold; +} +.authentication-accordion .card-header .btn-link{ + color: #1B3E6F; + width: 100%; + text-align: left; + padding-left: 0px !important; + font-size: 14px; +} +.authentication-accordion .custom-control{ + display: inline-block; +} +.authentication-accordion .btn-link::before{ + margin-right: 10px; +} +.authentication-accordion .btn-link.collapsed::before{ + margin-right: 14px; +} +.template-mapping-accordion{ + width: 100%; +} +.card{ + border-radius: 2px; + border: 0; + box-shadow: 0 2px 6px 0 rgba(47, 83, 151, 0.1); + border: 0px !important; +} +.card-header{ + padding: 10px 25px !important; + background: #F4F9FE !important; + border-radius: 0px !important; + border-bottom: 1px solid #ECEDF2 !important; +} +.card-body { + padding: 20px 25px !important; + font-size: 14px; +} +.card-header .btn-link{ + color: #1B3E6F; + width: 100%; + text-align: left; + padding-left: 0px !important; +} +.accordion .card{ + margin-bottom: 0px !important; + border-top: 1px solid #ECEDF2 !important; +} +.template-mapping-accordion .card{ + margin-bottom: 25px !important; +} +.custom-control{ + display: inline-block; +} +.btn-link::before{ + margin-right: 10px; +} +.btn-link.collapsed::before{ + margin-right: 14px; +} +.drap-drop-action{ + padding: 12px 20px 9px 20px; + color: #C3CDDB; + cursor:move; + font-size: 15px; +} +.modal-title { + font-size: 14px; +} +.select-type{ + background: #F4F9FE; + border: 1px solid #D7E7F9; + padding: 10px; + text-align: center; + color: #1273EB; + font-size: 15px; + width: 100%; + position: relative; +} +.select-type:hover, .select-type.active{ + background: #1B3E6F; + border: 1px solid #D7E7F9; + color: #fff; + text-decoration: none; +} +.select-type-icon{ + font-size: 35px; +} +.select-type::before{ + content: ''; + border: 1px solid #1273EB; + width: 18px; + height: 18px; + border-radius: 18px; + display: inline-block; + left: 10px; + position: absolute; +} +.select-type:hover::before, .select-type.active::before{ + border: 1px solid #fff; +} +.select-type.active::after{ + content: ''; + background: #fff; + width: 12px; + height: 12px; + border-radius: 18px; + display: inline-block; + left: 13px; + position: absolute; + top: 13px; +} /* Extra small devices (portrait phones, less than 576px) */ @media (max-width: 575.98px) { .page-title{ diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json index b7109251e..4df92dd3e 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json @@ -1,21 +1,78 @@ { "data_types" : { + "dt-config-deploy-properties" : { + "description" : "Dynamic DataType definition for workflow(config-deploy).", + "version" : "1.0.0", + "properties" : { + "vpg_onap_private_ip_0" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "vnf-id" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "service-instance-id" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "active-streams" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "put-active-streams" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + } + }, + "derived_from" : "tosca.datatypes.Dynamic" + }, "dt-resource-assignment-properties" : { "description" : "Dynamic DataType definition for workflow(resource-assignment).", "version" : "1.0.0", "properties" : { - "nf-role" : { + "vf-module-name" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], - "default" : "vSN", + "default" : "${vf-module-name}", "entry_schema" : { "type" : "" } }, - "vm-type" : { + "private1-prefix-id" : { "description" : "", "required" : false, "type" : "string", @@ -27,7 +84,27 @@ }, "vnf-id" : { "description" : "", - "required" : true, + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "vsn_flavor_name" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "vfw_int_private2_ip_0" : { + "description" : "", + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -37,17 +114,15 @@ }, "public_net_id" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], - "value" : "public_net_id", - "default" : "public_net_id", "entry_schema" : { "type" : "" } }, - "vnf_name" : { + "sec_group" : { "description" : "", "required" : false, "type" : "string", @@ -57,7 +132,7 @@ "type" : "" } }, - "vfw_private_ip_1" : { + "nfc-naming-code" : { "description" : "", "required" : false, "type" : "string", @@ -67,27 +142,28 @@ "type" : "" } }, - "unprotected-prefix-id" : { + "vnfc-model-invariant-uuid" : { "description" : "", "required" : false, - "type" : "integer", + "type" : "string", "status" : "", "constraints" : [ { } ], "entry_schema" : { "type" : "" } }, - "onap_private_subnet_id" : { + "vfw_name_0" : { "description" : "", "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "${vfw_name_0}", "entry_schema" : { "type" : "" } }, - "vfw_private_ip_0" : { + "nexus_artifact_repo" : { "description" : "", "required" : false, "type" : "string", @@ -97,9 +173,9 @@ "type" : "" } }, - "aic-cloud-region" : { + "onap_private_net_cidr" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -107,18 +183,18 @@ "type" : "" } }, - "sec_group" : { + "vpg_onap_private_ip_0" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], - "default" : "onap_sg_PUhf", + "default" : "vpg_onap_private_ip_0", "entry_schema" : { "type" : "" } }, - "vfw_private_ip_2" : { + "image_name" : { "description" : "", "required" : false, "type" : "string", @@ -128,9 +204,9 @@ "type" : "" } }, - "vnfc-model-invariant-uuid" : { + "flavor_name" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -138,29 +214,31 @@ "type" : "" } }, - "nfc-naming-code" : { + "dcae_collector_ip" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "10.0.4.1", "entry_schema" : { "type" : "" } }, - "private-prefix-id" : { + "vpg_name_0" : { "description" : "", "required" : false, - "type" : "integer", + "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "${vpg_name_0}", "entry_schema" : { "type" : "" } }, - "vf-module-model-customization-uuid" : { + "vf-naming-policy" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -168,7 +246,7 @@ "type" : "" } }, - "vfw_name_0" : { + "int_private2_net_cidr" : { "description" : "", "required" : false, "type" : "string", @@ -178,7 +256,7 @@ "type" : "" } }, - "vf_module_name" : { + "vfccustomizationuuid" : { "description" : "", "required" : false, "type" : "string", @@ -188,21 +266,20 @@ "type" : "" } }, - "nexus_artifact_repo" : { + "vsn_name_0" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], - "value" : "nexus_artifact_repo", - "default" : "nexus_artifact_repo", + "default" : "${vsn_name_0}", "entry_schema" : { "type" : "" } }, - "onap_private_net_cidr" : { + "onap_private_net_id" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -210,7 +287,7 @@ "type" : "" } }, - "image_name" : { + "demo_artifacts_version" : { "description" : "", "required" : false, "type" : "string", @@ -220,9 +297,9 @@ "type" : "" } }, - "vf-nf-code" : { + "vnf-model-customization-uuid" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -230,19 +307,20 @@ "type" : "" } }, - "vf-module-id" : { + "vfw_int_private1_ip_0" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "${vfw_int_private1_ip_0}", "entry_schema" : { "type" : "" } }, - "vf-module-label" : { + "key_name" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -250,7 +328,7 @@ "type" : "" } }, - "vsn_private_ip_0" : { + "install_script_version" : { "description" : "", "required" : false, "type" : "string", @@ -260,7 +338,7 @@ "type" : "" } }, - "vpg_name_0" : { + "vfw_image_name" : { "description" : "", "required" : false, "type" : "string", @@ -270,19 +348,20 @@ "type" : "" } }, - "vpg_private_ip_1" : { + "vfw_onap_private_ip_0" : { "description" : "", "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "${vfw_onap_private_ip_0}", "entry_schema" : { "type" : "" } }, - "protected_private_net_cidr" : { + "vnf_name" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -290,18 +369,17 @@ "type" : "" } }, - "vf-naming-policy" : { + "onap_private_subnet_id" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], - "default" : "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP", "entry_schema" : { "type" : "" } }, - "vpg_private_ip_0" : { + "aic-cloud-region" : { "description" : "", "required" : false, "type" : "string", @@ -311,7 +389,7 @@ "type" : "" } }, - "vsn_private_ip_1" : { + "vsn_int_private2_ip_0" : { "description" : "", "required" : false, "type" : "string", @@ -321,9 +399,9 @@ "type" : "" } }, - "vfccustomizationuuid" : { + "vf-module-model-customization-uuid" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -331,9 +409,9 @@ "type" : "" } }, - "unprotected_private_net_cidr" : { + "vsn_image_name" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -341,7 +419,7 @@ "type" : "" } }, - "vsn_name_0" : { + "vpg_flavor_name" : { "description" : "", "required" : false, "type" : "string", @@ -351,7 +429,58 @@ "type" : "" } }, - "onap_private_net_id" : { + "vf-module-id" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "dcae_collector_port" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "default" : "30235", + "entry_schema" : { + "type" : "" + } + }, + "vf-module-label" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "vfw_int_private2_floating_ip" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "vpg_image_name" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "private2-prefix-id" : { "description" : "", "required" : false, "type" : "string", @@ -363,7 +492,7 @@ }, "vnfc-model-version" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -373,7 +502,7 @@ }, "service-instance-id" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -381,19 +510,30 @@ "type" : "" } }, - "vf-module-type" : { + "vsn_onap_private_ip_0" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "${vsn_onap_private_ip_0}", "entry_schema" : { "type" : "" } }, - "vnf-model-customization-uuid" : { + "vfw_flavor_name" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "vf-module-type" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], @@ -411,7 +551,17 @@ "type" : "" } }, - "key_name" : { + "management-prefix-id" : { + "description" : "", + "required" : false, + "type" : "string", + "status" : "", + "constraints" : [ { } ], + "entry_schema" : { + "type" : "" + } + }, + "int_private1_net_cidr" : { "description" : "", "required" : false, "type" : "string", @@ -421,22 +571,24 @@ "type" : "" } }, - "protected-prefix-id" : { + "vpg_int_private1_ip_0" : { "description" : "", "required" : false, - "type" : "integer", + "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "${vpg_int_private1_ip_0}", "entry_schema" : { "type" : "" } }, - "vnf-name" : { + "cloud_env" : { "description" : "", - "required" : true, + "required" : false, "type" : "string", "status" : "", "constraints" : [ { } ], + "default" : "openstack", "entry_schema" : { "type" : "" } diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json index a35974c83..baeafb6bb 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json @@ -1,4 +1,22 @@ { + "active-streams" : { + "tags" : "active-streams", + "name" : "active-streams", + "property" : { + "description" : "active-streams", + "type" : "string" + }, + "updated-by" : "Singal, Kapil <ks220y@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + } + } + }, "aic-cloud-region" : { "tags" : "aic-cloud-region", "name" : "aic-cloud-region", @@ -14,6 +32,181 @@ } } }, + "cloud_env" : { + "tags" : "cloud_env", + "name" : "cloud_env", + "property" : { + "description" : "cloud_env", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/cloud_env", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "cloud_env" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + } + } + }, + "dcae_collector_ip" : { + "tags" : "dcae_collector_ip", + "name" : "dcae_collector_ip", + "property" : { + "description" : "dcae_collector_ip", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "dcae_collector_ip" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + } + } + }, + "dcae_collector_port" : { + "tags" : "dcae_collector_port", + "name" : "dcae_collector_port", + "property" : { + "description" : "dcae_collector_port", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "dcae_collector_port" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + } + } + }, + "demo_artifacts_version" : { + "tags" : "demo_artifacts_version", + "name" : "demo_artifacts_version", + "property" : { + "description" : "demo_artifacts_version", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "demo_artifacts_version" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + } + } + }, + "flavor_name" : { + "tags" : "flavor_name", + "name" : "flavor_name", + "property" : { + "description" : "flavor_name", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/flavor_name", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "flavor_name" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + } + } + }, "image_name" : { "tags" : "image_name", "name" : "image_name", @@ -21,16 +214,21 @@ "description" : "image_name", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { "type" : "source-input" }, + "default" : { + "type" : "source-default", + "properties" : { } + }, "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/image_name", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -44,6 +242,135 @@ } } }, + "install_script_version" : { + "tags" : "install_script_version", + "name" : "install_script_version", + "property" : { + "description" : "install_script_version", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/install_script_version", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "install_script_version" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + } + } + }, + "int_private1_net_cidr" : { + "tags" : "int_private1_net_cidr", + "name" : "int_private1_net_cidr", + "property" : { + "description" : "int_private1_net_cidr", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "processor-db" : { + "type" : "source-db", + "properties" : { + "endpoint-selector" : "dynamic-db-source", + "type" : "SQL", + "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"", + "input-key-mapping" : { }, + "output-key-mapping" : { + "int_private1_net_cidr" : "prefix" + } + } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "int_private1_net_cidr" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + } + } + }, + "int_private2_net_cidr" : { + "tags" : "int_private2_net_cidr", + "name" : "int_private2_net_cidr", + "property" : { + "description" : "int_private2_net_cidr", + "type" : "string" + }, + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "int_private2_net_cidr" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + }, + "processor-db" : { + "type" : "source-db", + "properties" : { + "endpoint-selector" : "dynamic-db-source", + "type" : "SQL", + "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"", + "input-key-mapping" : { }, + "output-key-mapping" : { + "int_private2_net_cidr" : "prefix" + } + } + } + } + }, "key_name" : { "tags" : "key_name", "name" : "key_name", @@ -51,16 +378,21 @@ "description" : "key_name", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { "type" : "source-input" }, + "default" : { + "type" : "source-default", + "properties" : { } + }, "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/key_name", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -74,11 +406,11 @@ } } }, - "nexus_artifact_repo" : { - "tags" : "nexus_artifact_repo", - "name" : "nexus_artifact_repo", + "management-prefix-id" : { + "tags" : "management-prefix-id", + "name" : "management-prefix-id", "property" : { - "description" : "nexus_artifact_repo", + "description" : "management-prefix-id", "type" : "string" }, "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", @@ -93,46 +425,65 @@ "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "nexus_artifact_repo" : "value" + "management-prefix-id" : "value" }, "key-dependencies" : [ "service-instance-id", "vnf-id" ] } + }, + "processor-db" : { + "type" : "source-db", + "properties" : { + "endpoint-selector" : "dynamic-db-source", + "type" : "SQL", + "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"", + "input-key-mapping" : { }, + "output-key-mapping" : { + "management-prefix-id" : "prefix_id" + } + } } } }, - "nf-role" : { - "tags" : "nf-role", - "name" : "nf-role", + "nexus_artifact_repo" : { + "tags" : "nexus_artifact_repo", + "name" : "nexus_artifact_repo", "property" : { - "description" : "vnf/nf-role", + "description" : "nexus_artifact_repo", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { + "input" : { + "type" : "source-input" + }, "default" : { "type" : "source-default", "properties" : { } }, - "processor-db" : { - "type" : "source-db", + "sdnc" : { + "type" : "source-rest", "properties" : { - "type" : "SQL", - "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid", + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/nexus_artifact_repo", + "path" : "/param/0/value", "input-key-mapping" : { - "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid" + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "nf-role" : "vf_model_role" + "nexus_artifact_repo" : "value" }, - "key-dependencies" : [ "vnf-model-customization-uuid" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } @@ -156,7 +507,6 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid", "input-key-mapping" : { @@ -165,7 +515,8 @@ "output-key-mapping" : { "nfc-naming-code" : "nfc_naming_code" }, - "key-dependencies" : [ "vfccustomizationuuid" ] + "key-dependencies" : [ "vfccustomizationuuid" ], + "endpoint-selector" : "dynamic-db-source" } } } @@ -186,11 +537,24 @@ "type" : "source-default", "properties" : { } }, + "processor-db" : { + "type" : "source-db", + "properties" : { + "endpoint-selector" : "dynamic-db-source", + "type" : "SQL", + "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"", + "input-key-mapping" : { }, + "output-key-mapping" : { + "onap_private_net_cidr" : "prefix" + } + } + }, "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -201,18 +565,6 @@ }, "key-dependencies" : [ "service-instance-id", "vnf-id" ] } - }, - "processor-db" : { - "type" : "source-db", - "properties" : { - "endpoint-selector" : "dynamic-db-source", - "type" : "SQL", - "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"", - "input-key-mapping" : { }, - "output-key-mapping" : { - "onap_private_net_cidr" : "prefix" - } - } } } }, @@ -235,8 +587,9 @@ "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -269,8 +622,9 @@ "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -284,11 +638,11 @@ } } }, - "private-prefix-id" : { - "tags" : "private-prefix-id", - "name" : "private-prefix-id", + "private1-prefix-id" : { + "tags" : "private1-prefix-id", + "name" : "private1-prefix-id", "property" : { - "description" : "private-prefix-id", + "description" : "private1-prefix-id", "type" : "string" }, "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", @@ -300,57 +654,79 @@ "type" : "source-default", "properties" : { } }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "private1-prefix-id" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } + }, "processor-db" : { "type" : "source-db", "properties" : { "endpoint-selector" : "dynamic-db-source", "type" : "SQL", - "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"", + "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"", "input-key-mapping" : { }, "output-key-mapping" : { - "private-prefix-id" : "prefix_id" + "private1-prefix-id" : "prefix_id" } } } } }, - "protected-prefix-id" : { - "tags" : "protected-prefix-id", - "name" : "protected-prefix-id", + "private2-prefix-id" : { + "tags" : "private2-prefix-id", + "name" : "private2-prefix-id", "property" : { - "description" : "protected-prefix-id", + "description" : "private2-prefix-id", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { - "processor-db" : { - "type" : "source-db", + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", "properties" : { - "type" : "SQL", - "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"", + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, "output-key-mapping" : { - "protected-prefix-id" : "prefix_id" - } + "private2-prefix-id" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } - } - } - }, - "protected_private_net_cidr" : { - "tags" : "protected_private_net_cidr", - "name" : "protected_private_net_cidr", - "property" : { - "description" : "protected_private_net_cidr", - "type" : "string" - }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", - "sources" : { + }, "processor-db" : { "type" : "source-db", "properties" : { + "endpoint-selector" : "dynamic-db-source", "type" : "SQL", - "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"", + "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"", + "input-key-mapping" : { }, "output-key-mapping" : { - "protected_private_net_cidr" : "prefix" + "private2-prefix-id" : "prefix_id" } } } @@ -375,8 +751,9 @@ "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/pub_key", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -409,8 +786,9 @@ "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/public_net_id", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -424,6 +802,41 @@ } } }, + "put-active-streams" : { + "tags" : "put-active-streams", + "name" : "put-active-streams", + "property" : { + "description" : "put-active-streams", + "type" : "string" + }, + "updated-by" : "Singal, Kapil <ks220y@att.com>", + "sources" : { + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "PUT", + "type" : "JSON", + "url-path" : "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams", + "path" : "/param/0/value", + "input-key-mapping" : { + "vpg_onap_private_ip_0" : "vpg_onap_private_ip_0", + "active-streams" : "active-streams" + }, + "output-key-mapping" : { }, + "key-dependencies" : [ "vpg_onap_private_ip_0", "active-streams" ], + "endpoint-selector" : "vpkg-rest-api", + "payload" : "{\"streams\": {\"active-streams\": $active-streams}}" + } + }, + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + } + } + }, "sec_group" : { "tags" : "sec_group", "name" : "sec_group", @@ -443,8 +856,9 @@ "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/sec_group", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", @@ -501,48 +915,6 @@ } } }, - "unprotected-prefix-id" : { - "tags" : "unprotected-prefix-id", - "name" : "unprotected-prefix-id", - "property" : { - "description" : "unprotected-prefix-id", - "type" : "string" - }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", - "sources" : { - "processor-db" : { - "type" : "source-db", - "properties" : { - "type" : "SQL", - "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"", - "output-key-mapping" : { - "unprotected-prefix-id" : "prefix_id" - } - } - } - } - }, - "unprotected_private_net_cidr" : { - "tags" : "unprotected_private_net_cidr", - "name" : "unprotected_private_net_cidr", - "property" : { - "description" : "unprotected_private_net_cidr", - "type" : "string" - }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", - "sources" : { - "processor-db" : { - "type" : "source-db", - "properties" : { - "type" : "SQL", - "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"", - "output-key-mapping" : { - "unprotected_private_net_cidr" : "prefix" - } - } - } - } - }, "vf-module-id" : { "tags" : "vf-module-id", "name" : "vf-module-id", @@ -585,7 +957,8 @@ "output-key-mapping" : { "vf-module-label" : "vf_module_label" }, - "key-dependencies" : [ "vf-module-model-customization-uuid" ] + "key-dependencies" : [ "vf-module-model-customization-uuid" ], + "endpoint-selector" : "dynamic-db-source" } } } @@ -608,6 +981,24 @@ } } }, + "vf-module-name" : { + "tags" : "vf-module-name", + "name" : "vf-module-name", + "property" : { + "description" : "vf-module-name", + "type" : "string" + }, + "updated-by" : "Singal, Kapil <ks220y@att.com>", + "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + } + } + }, "vf-module-type" : { "tags" : "vf-module-type", "name" : "vf-module-type", @@ -615,20 +1006,28 @@ "description" : "vf-module-type", "type" : "string" }, - "updated-by" : "adetalhouet", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { + "input" : { + "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, "processor-db" : { "type" : "source-db", "properties" : { "type" : "SQL", - "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid", - "input-key-mapping" : { - "vfmoduleid" : "vf-module-number" - }, + "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid", "output-key-mapping" : { - "vf-module-type" : "value" + "vf-module-type" : "vf_module_type" + }, + "endpoint-selector" : "dynamic-db-source", + "input-key-mapping" : { + "customizationid" : "vf-module-model-customization-uuid" }, - "key-dependencies" : [ "vf-module-number" ] + "key-dependencies" : [ "vf-module-model-customization-uuid" ] } } } @@ -640,68 +1039,46 @@ "description" : "vf-naming-policy", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "default" : { "type" : "source-default", "properties" : { } }, - "processor-db" : { - "type" : "source-db", + "sdnc" : { + "type" : "source-rest", "properties" : { - "type" : "SQL", - "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid", + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vf-naming-policy", + "path" : "/param/0/value", "input-key-mapping" : { - "vnf_model_customization_uuid" : "vnf-model-customization-uuid" + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "vf-naming-policy" : "vf_naming_policy" + "vf-naming-policy" : "value" }, - "key-dependencies" : [ "vnf-model-customization-uuid" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } - } - } - }, - "vf-nf-code" : { - "tags" : "vf-nf-code", - "name" : "vf-nf-code", - "property" : { - "description" : "vf-nf-code", - "type" : "string" - }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", - "sources" : { + }, "processor-db" : { "type" : "source-db", "properties" : { + "endpoint-selector" : "dynamic-db-source", "type" : "SQL", - "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid", + "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid", "input-key-mapping" : { - "customizationid" : "vnf-model-customization-uuid" + "vnf_model_customization_uuid" : "vnf-model-customization-uuid" }, "output-key-mapping" : { - "vf-nf-code" : "vf_nf_code" + "vf-naming-policy" : "vf_naming_policy" }, "key-dependencies" : [ "vnf-model-customization-uuid" ] } } } }, - "vf_module_name" : { - "tags" : "vf_module_name", - "name" : "vf_module_name", - "property" : { - "description" : "vf_module_name", - "type" : "string" - }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", - "sources" : { - "input" : { - "type" : "source-input", - "properties" : { } - } - } - }, "vfccustomizationuuid" : { "tags" : "vfccustomizationuuid", "name" : "vfccustomizationuuid", @@ -735,104 +1112,151 @@ } } }, - "vfw_name_0" : { - "tags" : "vfw_name_0", - "name" : "vfw_name_0", + "vfw_int_private1_ip_0" : { + "tags" : "vfw_int_private1_ip_0", + "name" : "vfw_int_private1_ip_0", "property" : { - "description" : "vfw_name_0", + "description" : "vfw_int_private1_ip_0", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private1_ip_0", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "vfw_int_private1_ip_0" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } } } }, - "vfw_private_ip_0" : { - "tags" : "vfw_private_ip_0", - "name" : "vfw_private_ip_0", + "vfw_int_private2_floating_ip" : { + "tags" : "vfw_int_private2_floating_ip", + "name" : "vfw_int_private2_floating_ip", "property" : { - "description" : "vfw_private_ip_0", + "description" : "vfw_int_private2_floating_ip", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } }, "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_private_ip_0", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_floating_ip", "path" : "/param/0/value", - "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "vfw_private_ip_0" : "value" + "vfw_int_private2_floating_ip" : "value" }, "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } }, - "vfw_private_ip_1" : { - "tags" : "vfw_private_ip_1", - "name" : "vfw_private_ip_1", + "vfw_int_private2_ip_0" : { + "tags" : "vfw_int_private2_ip_0", + "name" : "vfw_int_private2_ip_0", "property" : { - "description" : "vfw_private_ip_1", + "description" : "vfw_int_private2_ip_0", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } }, "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_private_ip_1", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_int_private2_ip_0", "path" : "/param/0/value", - "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "vfw_private_ip_1" : "value" + "vfw_int_private2_ip_0" : "value" }, "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } }, - "vfw_private_ip_2" : { - "tags" : "vfw_private_ip_2", - "name" : "vfw_private_ip_2", + "vfw_name_0" : { + "tags" : "vfw_name_0", + "name" : "vfw_name_0", "property" : { - "description" : "vfw_private_ip_2", + "description" : "vfw_name_0", "type" : "string" }, "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_name_0", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "vfw_name_0" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } } } }, - "vm-type" : { - "tags" : "vm-type", - "name" : "vm-type", + "vfw_onap_private_ip_0" : { + "tags" : "vfw_onap_private_ip_0", + "name" : "vfw_onap_private_ip_0", "property" : { - "description" : "vm-type", + "description" : "vfw_onap_private_ip_0", "type" : "string" }, "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", @@ -844,19 +1268,21 @@ "type" : "source-default", "properties" : { } }, - "processor-db" : { - "type" : "source-db", + "sdnc" : { + "type" : "source-rest", "properties" : { - "endpoint-selector" : "dynamic-db-source", - "type" : "SQL", - "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid", + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_onap_private_ip_0", + "path" : "/param/0/value", "input-key-mapping" : { - "vfccustomizationuuid" : "vfccustomizationuuid" + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "vm-type" : "vm_type" + "vfw_onap_private_ip_0" : "value" }, - "key-dependencies" : [ "vfccustomizationuuid" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } @@ -894,11 +1320,11 @@ } } }, - "vnf-name" : { - "tags" : "vnf-name", - "name" : "vnf-name", + "vnf_name" : { + "tags" : "vnf_name", + "name" : "vnf_name", "property" : { - "description" : "vnf-name", + "description" : "vnf_name", "type" : "string" }, "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", @@ -913,15 +1339,16 @@ "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "vnf-name" : "value" + "vnf_name" : "value" }, "key-dependencies" : [ "service-instance-id", "vnf-id" ] } @@ -944,41 +1371,6 @@ } } }, - "vnf_name" : { - "tags" : "vnf_name", - "name" : "vnf_name", - "property" : { - "description" : "vnf_name", - "type" : "string" - }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", - "sources" : { - "default" : { - "type" : "source-default", - "properties" : { } - }, - "input" : { - "type" : "source-input", - "properties" : { } - }, - "sdnc" : { - "type" : "source-rest", - "properties" : { - "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name", - "path" : "/param/0/value", - "input-key-mapping" : { - "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id" - }, - "output-key-mapping" : { - "vnf_name" : "value" - }, - "key-dependencies" : [ "service-instance-id", "vnf-id" ] - } - } - } - }, "vnfc-model-invariant-uuid" : { "tags" : "vnfc-model-invariant-uuid", "name" : "vnfc-model-invariant-uuid", @@ -998,15 +1390,15 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid", - "input-key-mapping" : { - "vfccustomizationuuid" : "vfccustomizationuuid" - }, "output-key-mapping" : { "vnfc-model-invariant-uuid" : "vfc_invariant_uuid" }, + "endpoint-selector" : "dynamic-db-source", + "input-key-mapping" : { + "vfccustomizationuuid" : "vfccustomizationuuid" + }, "key-dependencies" : [ "vfccustomizationuuid" ] } } @@ -1031,140 +1423,227 @@ "processor-db" : { "type" : "source-db", "properties" : { - "endpoint-selector" : "dynamic-db-source", "type" : "SQL", "query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid", - "input-key-mapping" : { - "vfccustomizationuuid" : "vfccustomizationuuid" - }, "output-key-mapping" : { "vnfc-model-version" : "vnfc_model_version" }, + "endpoint-selector" : "dynamic-db-source", + "input-key-mapping" : { + "vfccustomizationuuid" : "vfccustomizationuuid" + }, "key-dependencies" : [ "vfccustomizationuuid" ] } } } }, - "vpg_name_0" : { - "tags" : "vpg_name_0", - "name" : "vpg_name_0", + "vpg_int_private1_ip_0" : { + "tags" : "vpg_int_private1_ip_0", + "name" : "vpg_int_private1_ip_0", "property" : { - "description" : "vpg_name_0", + "description" : "vpg_int_private1_ip_0", "type" : "string" }, "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_int_private1_ip_0", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "vpg_int_private1_ip_0" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } } } }, - "vpg_private_ip_0" : { - "tags" : "vpg_private_ip_0", - "name" : "vpg_private_ip_0", + "vpg_name_0" : { + "tags" : "vpg_name_0", + "name" : "vpg_name_0", "property" : { - "description" : "vpg_private_ip_0", + "description" : "vlb_name_0", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } }, "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_private_ip_0", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_name_0", "path" : "/param/0/value", - "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "vpg_private_ip_0" : "value" + "vpg_name_0" : "value" }, "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } }, - "vpg_private_ip_1" : { - "tags" : "vpg_private_ip_1", - "name" : "vpg_private_ip_1", + "vpg_onap_private_ip_0" : { + "tags" : "vpg_onap_private_ip_0", + "name" : "vpg_onap_private_ip_0", "property" : { - "description" : "vpg_private_ip_1", + "description" : "vpg_onap_private_ip_0", "type" : "string" }, "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "vpg_onap_private_ip_0" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } } } }, - "vsn_name_0" : { - "tags" : "vsn_name_0", - "name" : "vsn_name_0", + "vsn_int_private2_ip_0" : { + "tags" : "vsn_int_private2_ip_0", + "name" : "vsn_int_private2_ip_0", "property" : { - "description" : "vsn_name_0", + "description" : "vsn_int_private2_ip_0", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_int_private2_ip_0", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "vsn_int_private2_ip_0" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } } } }, - "vsn_private_ip_0" : { - "tags" : "vsn_private_ip_0", - "name" : "vsn_private_ip_0", + "vsn_name_0" : { + "tags" : "vsn_name_0", + "name" : "vsn_name_0", "property" : { - "description" : "vsn_private_ip_0", + "description" : "vsn_name_0", "type" : "string" }, "updated-by" : "Singal, Kapil <ks220y@att.com>", "sources" : { "input" : { - "type" : "source-input", + "type" : "source-input" + }, + "default" : { + "type" : "source-default", "properties" : { } }, "sdnc" : { "type" : "source-rest", "properties" : { + "verb" : "GET", "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_private_ip_0", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_name_0", "path" : "/param/0/value", - "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", "vnf-id" : "vnf-id" }, "output-key-mapping" : { - "vsn_private_ip_0" : "value" + "vsn_name_0" : "value" }, "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } }, - "vsn_private_ip_1" : { - "tags" : "vsn_private_ip_1", - "name" : "vsn_private_ip_1", + "vsn_onap_private_ip_0" : { + "tags" : "vsn_onap_private_ip_0", + "name" : "vsn_onap_private_ip_0", "property" : { - "description" : "vsn_private_ip_1", + "description" : "vsn_onap_private_ip_0", "type" : "string" }, - "updated-by" : "Singal, Kapil <ks220y@att.com>", + "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>", "sources" : { "input" : { "type" : "source-input" + }, + "default" : { + "type" : "source-default", + "properties" : { } + }, + "sdnc" : { + "type" : "source-rest", + "properties" : { + "verb" : "GET", + "type" : "JSON", + "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_onap_private_ip_0", + "path" : "/param/0/value", + "input-key-mapping" : { + "service-instance-id" : "service-instance-id", + "vnf-id" : "vnf-id" + }, + "output-key-mapping" : { + "vsn_onap_private_ip_0" : "value" + }, + "key-dependencies" : [ "service-instance-id", "vnf-id" ] + } } } } diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json index 9ff4f3a1f..5b1af84cd 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_CDS.json @@ -1,12 +1,12 @@ { "tosca_definitions_version" : "controller_blueprint_1_0_0", "metadata" : { - "template_author" : "Alexis de Talhouët", - "author-email" : "adetalhouet89@gmail.com", + "template_author" : "Abdelmuhaimen Seaudi", + "author-email" : "abdelmuhaimen.seaudi@orange.com", "user-groups" : "ADMIN, OPERATION", - "template_name" : "vFW_spinup", + "template_name" : "vFW_CDS", "template_version" : "1.0.0", - "template_tags" : "vFW" + "template_tags" : "vFW-CDS, vfw-CDS, SCALE-OUT, MACRO" }, "imports" : [ { "file" : "Definitions/data_types.json" @@ -19,6 +19,30 @@ }, { "file" : "Definitions/policy_types.json" } ], + "dsl_definitions" : { + "ipam-1" : { + "type" : "token-auth", + "url" : "http://netbox-nginx:8080", + "token" : "Token 0123456789abcdef0123456789abcdef01234567" + }, + "vpkg-rest-api" : { + "type" : "basic-auth", + "url" : "http://", + "username" : "admin", + "password" : "admin" + }, + "config-deploy-properties" : { + "resolution-key" : { + "get_input" : "resolution-key" + } + }, + "dynamic-db-source" : { + "type" : "maria-db", + "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl", + "username" : "root", + "password" : "secretpassword" + } + }, "topology_template" : { "workflows" : { "resource-assignment" : { @@ -50,6 +74,29 @@ } } } + }, + "config-deploy" : { + "steps" : { + "config-deploy" : { + "description" : "Config Deploy Workflow", + "target" : "config-deploy-process" + } + }, + "inputs" : { + "config-deploy-properties" : { + "description" : "Dynamic PropertyDefinition for workflow(config-deploy).", + "required" : true, + "type" : "dt-config-deploy-properties" + } + }, + "outputs" : { + "dry-run" : { + "type" : "json", + "value" : { + "get_attribute" : [ "config-deploy-process", "assignment-params" ] + } + } + } } }, "node_templates" : { @@ -61,7 +108,7 @@ "process" : { "inputs" : { "artifact-prefix-names" : { - "get_input" : "artifact-name" + "get_input" : "template-prefix" } } } @@ -69,37 +116,37 @@ } }, "artifacts" : { - "base-template" : { + "base_template-template" : { "type" : "artifact-template-velocity", - "file" : "Templates/base-template.vtl" + "file" : "Templates/base_template-template.vtl" }, - "base-mapping" : { + "base_template-mapping" : { "type" : "artifact-mapping-resource", - "file" : "Templates/base-mapping.json" + "file" : "Templates/base_template-mapping.json" }, - "vfw-template" : { + "vpkg-template" : { "type" : "artifact-template-velocity", - "file" : "Templates/vfw-template.vtl" + "file" : "Templates/vpkg-template.vtl" }, - "vfw-mapping" : { + "vpkg-mapping" : { "type" : "artifact-mapping-resource", - "file" : "Templates/vfw-mapping.json" + "file" : "Templates/vpkg-mapping.json" }, - "vfw-vnf-template" : { + "vfw-template" : { "type" : "artifact-template-velocity", - "file" : "Templates/vfw-vnf-template.vtl" + "file" : "Templates/vfw-template.vtl" }, - "vfw-vnf-mapping" : { + "vfw-mapping" : { "type" : "artifact-mapping-resource", - "file" : "Templates/vfw-vnf-mapping.json" + "file" : "Templates/vfw-mapping.json" }, - "vpg-template" : { + "vnf-template" : { "type" : "artifact-template-velocity", - "file" : "Templates/vpg-template.vtl" + "file" : "Templates/vnf-template.vtl" }, - "vpg-mapping" : { + "vnf-mapping" : { "type" : "artifact-mapping-resource", - "file" : "Templates/vpg-mapping.json" + "file" : "Templates/vnf-mapping.json" }, "vsn-template" : { "type" : "artifact-template-velocity", @@ -110,6 +157,30 @@ "file" : "Templates/vsn-mapping.json" } } + }, + "config-deploy-process" : { + "type" : "component-resource-resolution", + "interfaces" : { + "ResourceResolutionComponent" : { + "operations" : { + "process" : { + "inputs" : { + "artifact-prefix-names" : [ "nf-params" ] + } + } + } + } + }, + "artifacts" : { + "nf-params-template" : { + "type" : "artifact-template-velocity", + "file" : "Templates/nf-params-template.vtl" + }, + "nf-params-mapping" : { + "type" : "artifact-mapping-resource", + "file" : "Templates/nf-params-mapping.json" + } + } } } } diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta index edbb54e2d..73d40528a 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/TOSCA-Metadata/TOSCA.meta @@ -1,6 +1,8 @@ TOSCA-Meta-File-Version: 1.0.0 CSAR-Version: 1.0 -Created-By: Alexis de Talhouët -Entry-Definitions: Definitions/vFW_spinup.json -Template-Tags: test -Content-Type: application/vnd.oasis.bpmn +Created-By: PLATANIA, MARCO <platania@research.att.com> +Entry-Definitions: Definitions/vFW_CDS.json +Template-Tags: vFW-CDS +Template-Name: vFW-CDS +Template-Version: 1.0.0 +Content-Type: application/vnd.oasis.bpmn
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl deleted file mode 100644 index 271c50738..000000000 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl +++ /dev/null @@ -1,77 +0,0 @@ -{ - "resource-accumulator-resolved-data": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, - { - "param-name": "vnf_name", - "param-value": "${vnf-name}" - }, - { - "param-name": "vnf_model_customization_uuid", - "param-value": "${vnf-model-customization-uuid}" - }, - { - "param-name": "vf_module_id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "vf_module_type", - "param-value": "${vf-module-type}" - }, - { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" - }, - { - "param-name": "unprotected_private_subnet_id", - "param-value": "${vnf-name}_unprotected_sub" - }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" - }, - { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" - }, - { - "param-name": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" - }, - { - "param-name": "protected_private_net_cidr", - "param-value": "${protected_private_net_cidr}" - }, - { - "param-name": "vf_module_name", - "param-value": "${vnf-name}_base" - } - ], - "capability-data": [ - { - "capability-name": "aai-vf-module-put", - "key-mapping": [ - { - "payload": [ - { - "param-name": "vf-module", - "param-value": "vf-module" - } - ], - "output-key-mapping": [ - { - "resource-name": "aai-vf-module-put", - "resource-value": "${status}" - } - ] - } - ] - } - ] -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-mapping.json index 8123382ca..7ce97079a 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-mapping.json @@ -3,13 +3,11 @@ "name": "service-instance-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -18,22 +16,84 @@ "input-param": false, "dictionary-name": "service-instance-id", "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vf-module-name", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vf-module-name}" + }, + "input-param": false, + "dictionary-name": "vf-module-name", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "vf-module-label", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vf-module-label", + "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, { + "name": "vf-naming-policy", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vf-naming-policy", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ], + "version": 0 + }, + { "name": "vf-module-type", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -51,13 +111,11 @@ "name": "vf-module-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -66,22 +124,18 @@ "input-param": false, "dictionary-name": "vf-module-model-customization-uuid", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "vnf-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -90,22 +144,18 @@ "input-param": false, "dictionary-name": "vnf-id", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "vf-module-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -114,22 +164,18 @@ "input-param": false, "dictionary-name": "vf-module-id", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "vnf-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -138,22 +184,18 @@ "input-param": false, "dictionary-name": "vnf-model-customization-uuid", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "aic-cloud-region", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -162,53 +204,48 @@ "input-param": false, "dictionary-name": "aic-cloud-region", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "nf-role", + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "processor-db", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - "vnf-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnf-name", + "name": "int_private2_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", + "dictionary-name": "int_private2_net_cidr", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -217,51 +254,51 @@ "version": 0 }, { - "name": "unprotected_private_net_cidr", + "name": "vnf_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "vnf_name", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "protected_private_net_cidr", + "name": "pub_key", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "protected_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "pub_key", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 } -] + + +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl new file mode 100644 index 000000000..f19db4146 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl @@ -0,0 +1,109 @@ +{ + "resource-accumulator-resolved-data": [ + { + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + + { + "param-name": "vnf_name", + "param-value": "${vnf_name}" + }, + { + "param-name": "vnf_model_customization_uuid", + "param-value": "${vnf-model-customization-uuid}" + }, + { + "param-name": "vf_module_id", + "param-value": "${vf-module-id}" + }, + { + "param-name": "vf_module_type", + "param-value": "${vf-module-type}" + }, + + { + "param-name": "int_private1_net_cidr", + "param-value": "${int_private1_net_cidr}" + }, + + { + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" + }, + + { + "param-name": "pub_key", + "param-value": "${pub_key}" + } + + ], + "capability-data": [ + { + "capability-name": "generate-name", + "key-mapping": [ + { + "payload": [ + { + "param-name": "resource-name", + "param-value": "vf-module-name" + }, + { + "param-name": "resource-value", + "param-value": "${vf-module-name}" + }, + { + "param-name": "external-key", + "param-value": "${vf-module-id}_vf-module-name" + }, + { + "param-name": "policy-instance-name", + "param-value": "${vf-naming-policy}" + }, + { + "param-name": "naming-type", + "param-value": "VF-MODULE" + }, + { + "param-name": "VNF_NAME", + "param-value": "${vnf_name}" + }, + { + "param-name": "VF_MODULE_LABEL", + "param-value": "${vf-module-label}" + }, + { + "param-name": "VF_MODULE_TYPE", + "param-value": "${vf-module-type}" + } + ], + "output-key-mapping": [ + { + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" + } + ] + } + ] + }, + { + "capability-name": "aai-vf-module-put", + "key-mapping": [ + { + "payload": [ + { + "param-name": "vf-module", + "param-value": "vf-module" + } + ], + "output-key-mapping": [ + { + "resource-name": "aai-vf-module-put", + "resource-value": "${status}" + } + ] + } + ] + } + ] +}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json new file mode 100644 index 000000000..50ab8d801 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json @@ -0,0 +1,112 @@ +[ + { + "name": "service-instance-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vnf-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vnf-id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + + { + "name": "active-streams", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "active-streams", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + + { + "name": "put-active-streams", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "put-active-streams", + "dictionary-source": "sdnc", + "dependencies": [ + "vpg_onap_private_ip_0", + "active-streams" + + ], + "version": 0 + }, + + { + "name": "vpg_onap_private_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vpg_onap_private_ip_0", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ], + "version": 0 + } +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl new file mode 100644 index 000000000..90aaecd12 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl @@ -0,0 +1,5 @@ +{ + "vpg_onap_private_ip_0": "${vpg_onap_private_ip_0}", + "active-streams": "${active-streams}", + "status": "${put-active-streams}" +}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json index 148696443..86a5cc857 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json @@ -1,70 +1,66 @@ [ { - "name": "service-instance-id", + "name": "cloud_env", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", + "dictionary-name": "cloud_env", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnf-id", + "name": "vpg_int_private1_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-id", - "dictionary-source": "input", + "dictionary-name": "vpg_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "vnf-name", + { + "name": "nexus_artifact_repo", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", + "dictionary-name": "nexus_artifact_repo", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -72,216 +68,237 @@ ], "version": 0 }, + + + { - "name": "vnf-model-customization-uuid", + "name": "vfw_int_private2_floating_ip", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "vfw_int_private2_floating_ip", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-id", + "name": "vfw_int_private1_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-id", - "dictionary-source": "input", + "dictionary-name": "vfw_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, + { - "name": "vf-module-type", + "name": "vfw_int_private2_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-type", - "dictionary-source": "processor-db", + "dictionary-name": "vfw_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, + + + + + { - "name": "vf-module-model-customization-uuid", + "name": "private1-prefix-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vf-module-model-customization-uuid", - "dictionary-source": "input", - "dependencies": [ - - ], + "dictionary-name": "private1-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], "version": 0 }, - { - "name": "vfccustomizationuuid", + { + "name": "management-prefix-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vfccustomizationuuid", + "dictionary-name": "management-prefix-id", "dictionary-source": "processor-db", - "dependencies": [ - "vf-module-model-customization-uuid" - ], + "dependencies": [], "version": 0 }, { - "name": "aic-cloud-region", + "name": "onap_private_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", + "dictionary-name": "onap_private_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vm-type", + "name": "vf-module-name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vf-module-name}" + }, + "input-param": false, + "dictionary-name": "vf-module-name", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "install_script_version", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vm-type", - "dictionary-source": "processor-db", + "dictionary-name": "install_script_version", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "vnfc-model-invariant-uuid", + { + "name": "demo_artifacts_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vnfc-model-invariant-uuid", - "dictionary-source": "processor-db", + "dictionary-name": "demo_artifacts_version", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, + + + { - "name": "vnfc-model-version", + "name": "nfc-naming-code", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-version", + "dictionary-name": "nfc-naming-code", "dictionary-source": "processor-db", "dependencies": [ "vfccustomizationuuid" @@ -289,97 +306,90 @@ "version": 0 }, { - "name": "nf-role", + "name": "onap_private_net_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "vFW" + } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "default", + "dictionary-name": "onap_private_net_id", + "dictionary-source": "sdnc", "dependencies": [ - "vnf-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nfc-naming-code", + "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nfc-naming-code", - "dictionary-source": "processor-db", + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "public_net_id", + { + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "public_net_id" + } }, "input-param": false, - "dictionary-name": "public_net_id", - "dictionary-source": "default", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "image_name", + { + "name": "int_private2_net_cidr", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "image_name", + "dictionary-name": "int_private2_net_cidr", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -388,23 +398,21 @@ "version": 0 }, { - "name": "key_name", + "name": "public_net_id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "key_name", + "dictionary-name": "public_net_id", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -412,7 +420,8 @@ ], "version": 0 }, - { + + { "name": "pub_key", "property": { "description": "", @@ -420,9 +429,7 @@ "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -438,23 +445,21 @@ "version": 0 }, { - "name": "onap_private_net_id", + "name": "sec_group", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_id", + "dictionary-name": "sec_group", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -463,319 +468,351 @@ "version": 0 }, { - "name": "onap_private_subnet_id", + "name": "service-instance-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, + { - "name": "unprotected_private_net_cidr", + "name": "vfw_name_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vfw_name_0}" + }, + "input-param": false, + "dictionary-name": "vfw_name_0", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "vfw_onap_private_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vfw_onap_private_ip_0}" + }, + "input-param": false, + "dictionary-name": "vfw_onap_private_ip_0", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + + { + "name": "vf-module-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", - "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dictionary-name": "vf-module-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "protected_private_net_cidr", + "name": "vf-module-label", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "protected_private_net_cidr", + "dictionary-name": "vf-module-label", "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "nexus_artifact_repo", + "name": "vf-module-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "nexus_artifact_repo" + } }, "input-param": false, - "dictionary-name": "nexus_artifact_repo", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vf-module-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "sec_group", + "name": "vf-module-type", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "onap_sg_PUhf" + } }, "input-param": false, - "dictionary-name": "sec_group", - "dictionary-source": "default", + "dictionary-name": "vf-module-type", + "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, + { + "name": "vf-naming-policy", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vf-naming-policy", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ], + "version": 0 + }, + { - "name": "onap_private_net_cidr", + "name": "vfccustomizationuuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_cidr", + "dictionary-name": "vfccustomizationuuid", "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, + { - "name": "vfw_name_0", + "name": "vnf-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfw_name_0", + "dictionary-name": "vnf-id", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "vf-naming-policy", + "name": "vnf-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP" + } }, "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vnf-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "vf_module_name", + "name": "vnf_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf_module_name", - "dictionary-source": "input", + "dictionary-name": "vnf_name", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-label", + "name": "vnfc-model-invariant-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-label", + "dictionary-name": "vnfc-model-invariant-uuid", "dictionary-source": "processor-db", "dependencies": [ - "vf-module-model-customization-uuid" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "private-prefix-id", + "name": "vfw_image_name", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } - }, + }, "input-param": false, - "dictionary-name": "private-prefix-id", - "dictionary-source": "processor-db", + "dictionary-name": "image_name", + "dictionary-source": "sdnc", "dependencies": [ - - ], + "service-instance-id", + "vnf-id" + ], "version": 0 }, - { - "name": "vfw_private_ip_2", + { + "name": "vfw_flavor_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } - }, + }, "input-param": false, - "dictionary-name": "vfw_private_ip_2", - "dictionary-source": "input", + "dictionary-name": "flavor_name", + "dictionary-source": "sdnc", "dependencies": [ - - ], + "service-instance-id", + "vnf-id" + ], "version": 0 }, { - "name": "vnf_name", + "name": "vnfc-model-version", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf_name", - "dictionary-source": "input", + "dictionary-name": "vnfc-model-version", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 } -] +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl index 6864a36fe..c64133e1f 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl @@ -4,13 +4,10 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "vnf_model_customization_uuid", @@ -37,10 +34,6 @@ "param-value": "${aic-cloud-region}" }, { - "param-name": "vm-type", - "param-value": "${vm-type}" - }, - { "param-name": "vnfc-model-customization-uuid", "param-value": "${vfccustomizationuuid}" }, @@ -53,68 +46,32 @@ "param-value": "${vnfc-model-version}" }, { - "param-name": "nfc-function", - "param-value": "${nf-role}" - }, - { "param-name": "nfc-naming-code", "param-value": "${nfc-naming-code}" }, { - "param-name": "cloud_env", - "param-value": "openstack" - }, - { - "param-name": "repo_url_artifacts", - "param-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "param-name": "repo_url_blob", - "param-value": "https://nexus.onap.org/content/repositories/raw" + "param-name": "vfw_image_name", + "param-value": "${vfw_image_name}" }, { - "param-name": "dcae_collector_port", - "param-value": "8080" - }, - { - "param-name": "image_name", - "param-value": "${image_name}" - }, - { - "param-name": "flavor_name", - "param-value": "m1.medium" - }, - { - "param-name": "install_script_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "demo_artifacts_version", - "param-value": "1.2.1-SNAPSHOT" + "param-name": "vfw_flavor_name", + "param-value": "${vfw_flavor_name}" }, { - "param-name": "dcae_collector_ip", - "param-value": "10.0.4.1" - }, - { - "param-name": "key_name", - "param-value": "${key_name}" + "param-name": "public_net_id", + "param-value": "${public_net_id}" }, { "param-name": "pub_key", "param-value": "${pub_key}" }, - { - "param-name": "public_net_id", - "param-value": "${public_net_id}" + { + "param-name": "int_private1_net_cidr", + "param-value": "${int_private1_net_cidr}" }, - { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" - }, - { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" + { + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" }, { "param-name": "onap_private_net_id", @@ -124,38 +81,59 @@ "param-name": "onap_private_subnet_id", "param-value": "${onap_private_subnet_id}" }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" + { + "param-name": "onap_private_net_cidr", + "param-value": "${onap_private_net_cidr}" }, - { - "param-name": "protected_private_net_cidr", - "param-value": "${protected_private_net_cidr}" + { + "param-name": "vfw_int_private1_ip_0", + "param-value": "${vfw_int_private1_ip_0}" }, - { - "param-name": "unprotected_private_subnet_id", - "param-value": "${vnf-name}_unprotected_sub" + { + "param-name": "vfw_int_private2_ip_0", + "param-value": "${vfw_int_private2_ip_0}" }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" + { + "param-name": "vpg_int_private1_ip_0", + "param-value": "${vpg_int_private1_ip_0}" + }, + { + "param-name": "vfw_int_private2_floating_ip", + "param-value": "${vfw_int_private2_floating_ip}" }, { - "param-name": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" + "param-name": "dcae_collector_ip", + "param-value": "$(dcae_collector_ip)" + }, + { + "param-name": "dcae_collector_port", + "param-value": "$(dcae_collector_port)" + }, + { + "param-name": "demo_artifacts_version", + "param-value": "${demo_artifacts_version}}" + }, + { + "param-name": "install_script_version", + "param-value": "${install_script_version}" }, { - "param-name": "nexus_artifact_repo", - "param-value": "${nexus_artifact_repo}" + "param-name": "key_name", + "param-value": "${vnf_name}_key_name" }, { + "param-name": "cloud_env", + "param-value": "$(cloud_env)" + }, + { "param-name": "sec_group", "param-value": "${sec_group}" }, - { - "param-name": "onap_private_net_cidr", - "param-value": "${onap_private_net_cidr}" + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" } + ], "capability-data": [ { @@ -180,16 +158,12 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNFC" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "NFC_NAMING_CODE", @@ -207,31 +181,27 @@ "payload": [ { "param-name": "resource-name", - "param-value": "vf_module_name" + "param-value": "vf-module-name" }, { "param-name": "resource-value", - "param-value": "${vf_module_name}" + "param-value": "${vf-module-name}" }, { "param-name": "external-key", - "param-value": "${vf-module-id}_vf_module_name" + "param-value": "${vf-module-id}_vf-module-name" }, { "param-name": "policy-instance-name", "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VF-MODULE" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "VF_MODULE_LABEL", @@ -244,8 +214,8 @@ ], "output-key-mapping": [ { - "resource-name": "vf_module_name", - "resource-value": "${vf_module_name}" + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" } ] } @@ -262,21 +232,21 @@ }, { "param-name": "prefix-id", - "param-value": "${private-prefix-id}" + "param-value": "${management-prefix-id}" }, { - "param-name": "vf-module-id", + "param-name": "vf_module_id", "param-value": "${vf-module-id}" }, { "param-name": "external_key", - "param-value": "${vf-module-id}-vfw_private_ip_2" + "param-value": "${vf-module-id}-vfw_onap_private_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vfw_private_ip_2", - "resource-value": "${vfw_private_ip_2}" + "resource-name": "vfw_onap_private_ip_0", + "resource-value": "${vfw_onap_private_ip_0}" } ] } @@ -290,10 +260,6 @@ { "param-name": "vf-module", "param-value": "vf-module" - }, - { - "param-name": "vnfc", - "param-value": "vnfc" } ], "output-key-mapping": [ @@ -304,35 +270,6 @@ ] } ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "KEY", - "resource-value": "${vnf_name}" - }, - { - "resource-name": "vf-module-name", - "resource-value": "${vf_module_name}" - }, - { - "resource-name": "vnfc-name", - "resource-value": "${vfw_name_0}" - }, - { - "resource-name": "ipv4-oam-address", - "resource-value": "${vfw_private_ip_2}" - }, - { - "resource-name": "ipv4-oam-address-prefix", - "resource-value": "${onap_private_net_cidr}" - } - ] - } - ] } ] }
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json deleted file mode 100644 index d764572e4..000000000 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json +++ /dev/null @@ -1,461 +0,0 @@ -[ - { - "name": "service-instance-id", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vnf-id", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vnf-id", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vnf-model-customization-uuid", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "aic-cloud-region", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "onap_private_net_id", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "onap_private_net_id", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "onap_private_subnet_id", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "key_name", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "key_name", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "image_name", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - }, - "default": "Ubuntu 14.04 LTS Generic" - }, - "input-param": false, - "dictionary-name": "image_name", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "pub_key", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - }, - "default": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" - }, - "input-param": false, - "dictionary-name": "pub_key", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vnf_name", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vnf_name", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vf-naming-policy", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP" - }, - "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "nf-role", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "processor-db", - "dependencies": [ - "vnf-model-customization-uuid" - ], - "version": 0 - }, - { - "name": "vfw_private_ip_1", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vfw_private_ip_1", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vfw_private_ip_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vfw_private_ip_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vpg_private_ip_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vpg_private_ip_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vsn_private_ip_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vsn_private_ip_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "protected-prefix-id", - "property": { - "description": "", - "required": false, - "type": "integer", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "protected-prefix-id", - "dictionary-source": "processor-db", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "unprotected-prefix-id", - "property": { - "description": "", - "required": false, - "type": "integer", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "unprotected-prefix-id", - "dictionary-source": "processor-db", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vf-nf-code", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vf-nf-code", - "dictionary-source": "processor-db", - "dependencies": [ - "vnf-model-customization-uuid" - ], - "version": 0 - } -]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json new file mode 100644 index 000000000..f2cb91935 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json @@ -0,0 +1,629 @@ +[ + { + "name": "cloud_env", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": true, + "dictionary-name": "cloud_env", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "management-prefix-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "management-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + }, + { + "name": "key_name", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": true, + "dictionary-name": "key_name", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "flavor_name", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": true, + "dictionary-name": "flavor_name", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "nexus_artifact_repo", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default":"https://nexus.onap.org" + }, + "input-param": false, + "dictionary-name": "nexus_artifact_repo", + "dictionary-source": "default", + "dependencies": [ + ], + "version": 0 + }, + { + "name": "vpg_onap_private_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default":"vpg_onap_private_ip_0" + }, + "input-param": false, + "dictionary-name": "vpg_onap_private_ip_0", + "dictionary-source": "default", + "dependencies": [ + ], + "version": 0 + }, + + { + "name": "int_private1_net_cidr", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": true, + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + }, + { + "name": "onap_private_net_cidr", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": true, + "dictionary-name": "onap_private_net_cidr", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + }, + + + { + "name": "int_private2_net_cidr", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": true, + "dictionary-name": "int_private2_net_cidr", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + }, + + + { + "name": "demo_artifacts_version", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "demo_artifacts_version", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "image_name", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "image_name", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "install_script_version", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "install_script_version", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "pub_key", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "pub_key", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "public_net_id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "public_net_id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "sec_group", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "sec_group", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vnf-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "vnf-id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vnf-model-customization-uuid", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "vnf-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vf-naming-policy", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "SDNC_Policy.Config_MS_ONAP_VNF_NAMING_TIMESTAMP" + }, + "input-param": false, + "dictionary-name": "vf-naming-policy", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "vnf_name", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vnf_name}" + }, + "input-param": false, + "dictionary-name": "vnf_name", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "vpg_int_private1_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vpg_int_private1_ip_0}" + }, + "input-param": false, + "dictionary-name": "vpg_int_private1_ip_0", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "aic-cloud-region", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "aic-cloud-region", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "onap_private_net_id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "onap_private_net_id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "onap_private_subnet_id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vfw_int_private2_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vfw_int_private2_ip_0}" + }, + "input-param": false, + "dictionary-name": "vfw_int_private2_ip_0", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "vfw_int_private1_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vfw_int_private1_ip_0}" + }, + "input-param": false, + "dictionary-name": "vfw_int_private1_ip_0", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "vfw_onap_private_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vfw_onap_private_ip_0}" + }, + "input-param": false, + "dictionary-name": "vfw_onap_private_ip_0", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "vsn_int_private2_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vsn_int_private2_ip_0}" + }, + "input-param": false, + "dictionary-name": "vsn_int_private2_ip_0", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "service-instance-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + + { + "name": "private1-prefix-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "private1-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + }, + { + "name": "private2-prefix-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "private2-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + } +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-template.vtl index f7947ef8f..e114abe48 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-template.vtl @@ -4,10 +4,7 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf-model-customization-uuid", "param-value": "${vnf-model-customization-uuid}" @@ -17,20 +14,65 @@ "param-value": "${aic-cloud-region}" }, { + "param-name": "vf-naming-policy", + "param-value": "${vf-naming-policy}" + }, + { + "param-name": "image_name", + "param-value": "${image_name}" + }, + { + "param-name": "flavor_name", + "param-value": "${flavor_name}" + }, + { + "param-name": "public_net_id", + "param-value": "${public_net_id}" + }, + { + "param-name": "int_private1_net_cidr", + "param-value": "${int_private1_net_cidr}" + }, + { + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" + }, + { "param-name": "onap_private_net_id", "param-value": "${onap_private_net_id}" }, { + "param-name": "onap_private_subnet_id", + "param-value": "${onap_private_subnet_id}" + }, + { + "param-name": "onap_private_net_cidr", + "param-value": "${onap_private_net_cidr}" + }, + { + "param-name": "demo_artifacts_version", + "param-value": "${demo_artifacts_version}" + }, + { + "param-name": "install_script_version", + "param-value": "${install_script_version}" + }, + + { "param-name": "pub_key", "param-value": "${pub_key}" }, { - "param-name": "image_name", - "param-value": "${image_name}" + "param-name": "cloud_env", + "param-value": "${cloud_env}" }, { - "param-name": "onap_private_subnet_id", - "param-value": "${onap_private_subnet_id}" + "param-name": "sec_group", + "param-value": "${sec_group}" + }, + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" } ], "capability-data": [ @@ -56,10 +98,6 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNF" }, @@ -88,7 +126,7 @@ }, { "param-name": "prefix-id", - "param-value": "${protected-prefix-id}" + "param-value": "${private2-prefix-id}" }, { "param-name": "vnf-id", @@ -96,13 +134,13 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vfw_private_ip_1" + "param-value": "${vnf-id}-vfw_int_private2_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vfw_private_ip_1", - "resource-value": "${vfw_private_ip_1}" + "resource-name": "vfw_int_private2_ip_0", + "resource-value": "${vfw_int_private2_ip_0}" } ] }, @@ -114,7 +152,7 @@ }, { "param-name": "prefix-id", - "param-value": "${unprotected-prefix-id}" + "param-value": "${private1-prefix-id}" }, { "param-name": "vnf-id", @@ -122,13 +160,13 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vfw_private_ip_0" + "param-value": "${vnf-id}-vfw_int_private1_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vfw_private_ip_0", - "resource-value": "${vfw_private_ip_0}" + "resource-name": "vfw_int_private1_ip_0", + "resource-value": "${vfw_int_private1_ip_0}" } ] }, @@ -140,7 +178,7 @@ }, { "param-name": "prefix-id", - "param-value": "${unprotected-prefix-id}" + "param-value": "${private1-prefix-id}" }, { "param-name": "vnf-id", @@ -148,13 +186,13 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vpg_private_ip_0" + "param-value": "${vnf-id}-vfw_int_private2_floating_ip" } ], "output-key-mapping": [ { - "resource-name": "vpg_private_ip_0", - "resource-value": "${vpg_private_ip_0}" + "resource-name": "vfw_int_private2_floating_ip", + "resource-value": "${vfw_int_private2_floating_ip}" } ] }, @@ -166,7 +204,7 @@ }, { "param-name": "prefix-id", - "param-value": "${protected-prefix-id}" + "param-value": "${private2-prefix-id}" }, { "param-name": "vnf-id", @@ -174,26 +212,65 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vsn_private_ip_0" + "param-value": "${vnf-id}-vsn_int_private2_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vsn_private_ip_0", - "resource-value": "${vsn_private_ip_0}" + "resource-name": "vsn_int_private2_ip_0", + "resource-value": "${vsn_int_private2_ip_0}" } ] - } - ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ + }, + { + "payload": [ + { + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + { + "param-name": "prefix-id", + "param-value": "${management-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-vpg_onap_private_ip_0" + } + ], + "output-key-mapping": [ + { + "resource-name": "vpg_onap_private_ip_0", + "resource-value": "${vpg_onap_private_ip_0}" + } + ] + }, { + "payload": [ + { + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + { + "param-name": "prefix-id", + "param-value": "${private1-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-vpg_int_private1_ip_0" + } + ], "output-key-mapping": [ { - "resource-name": "key_name", - "resource-value": "${vnf_name}_key" + "resource-name": "vpg_int_private1_ip_0", + "resource-value": "${vpg_int_private1_ip_0}" } ] } diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-mapping.json index 15531370c..8d17414c4 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-mapping.json @@ -1,70 +1,85 @@ [ { - "name": "service-instance-id", + "name": "cloud_env", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "openstack" }, "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", - "dependencies": [ - - ], + "dictionary-name": "cloud_env", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "vnf-id", + "name": "nexus_artifact_repo", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-id", - "dictionary-source": "input", + "dictionary-name": "nexus_artifact_repo", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnf-name", + "name": "vf-module-name", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vf-module-name}" + }, + "input-param": false, + "dictionary-name": "vf-module-name", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "demo_artifacts_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", + "dictionary-name": "demo_artifacts_version", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -73,313 +88,305 @@ "version": 0 }, { - "name": "vnf-model-customization-uuid", + "name": "install_script_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "install_script_version", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-id", + "name": "aic-cloud-region", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-id", + "dictionary-name": "aic-cloud-region", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "vf-module-type", + "name": "nfc-naming-code", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-type", + "dictionary-name": "nfc-naming-code", "dictionary-source": "processor-db", "dependencies": [ - "vf-module-model-customization-uuid" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vf-module-model-customization-uuid", + "name": "onap_private_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "onap_private_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vfccustomizationuuid", + "name": "onap_private_net_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfccustomizationuuid", - "dictionary-source": "processor-db", + "dictionary-name": "onap_private_net_id", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "aic-cloud-region", + "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vm-type", + "name": "public_net_id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vm-type", - "dictionary-source": "processor-db", + "dictionary-name": "public_net_id", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-invariant-uuid", + "name": "sec_group", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-invariant-uuid", - "dictionary-source": "processor-db", + "dictionary-name": "sec_group", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-version", + "name": "service-instance-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-version", - "dictionary-source": "processor-db", - "dependencies": [ - "vfccustomizationuuid" - ], + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "nf-role", + "name": "vf-module-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "vPG" + } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "default", - "dependencies": [ - "vnf-model-customization-uuid" - ], + "dictionary-name": "vf-module-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "nfc-naming-code", + "name": "vf-module-label", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nfc-naming-code", + "dictionary-name": "vf-module-label", "dictionary-source": "processor-db", "dependencies": [ - "vfccustomizationuuid" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "public_net_id", + "name": "vf-module-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "public_net_id" + } }, "input-param": false, - "dictionary-name": "public_net_id", - "dictionary-source": "default", + "dictionary-name": "vf-module-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vf-module-type", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vf-module-type", + "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "image_name", + "name": "vf-naming-policy", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "image_name", + "dictionary-name": "vf-naming-policy", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -388,48 +395,43 @@ "version": 0 }, { - "name": "key_name", + "name": "vfccustomizationuuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "key_name", - "dictionary-source": "sdnc", + "dictionary-name": "vfccustomizationuuid", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "pub_key", + "name": "vpg_flavor_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "pub_key", + "dictionary-name": "flavor_name", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -438,23 +440,21 @@ "version": 0 }, { - "name": "onap_private_net_id", + "name": "vpg_image_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_id", + "dictionary-name": "image_name", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -463,23 +463,21 @@ "version": 0 }, { - "name": "onap_private_subnet_id", + "name": "vnf_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_subnet_id", + "dictionary-name": "vnf_name", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -488,321 +486,288 @@ "version": 0 }, { - "name": "unprotected_private_net_cidr", + "name": "vpg_name_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "${vpg_name_0}" }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", - "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dictionary-name": "vpg_name_0", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "onap_private_net_cidr", + "name": "private2-prefix-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "onap_private_net_cidr", + "dictionary-name": "private2-prefix-id", "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "vfw_private_ip_0", + "name": "management-prefix-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vfw_private_ip_0", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "management-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], "version": 0 }, { - "name": "vsn_private_ip_0", + "name": "vnf-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vsn_private_ip_0", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "vnf-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "nexus_artifact_repo", + "name": "vnf-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "nexus_artifact_repo" + } }, "input-param": false, - "dictionary-name": "nexus_artifact_repo", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vnf-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "sec_group", + "name": "vnfc-model-invariant-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "onap_sg_PUhf" + } }, "input-param": false, - "dictionary-name": "sec_group", - "dictionary-source": "default", + "dictionary-name": "vnfc-model-invariant-uuid", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vpg_private_ip_0", + "name": "vnfc-model-version", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vpg_private_ip_0", - "dictionary-source": "sdnc", + "dictionary-name": "vnfc-model-version", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vpg_name_0", + "name": "vfw_int_private1_ip_0", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vpg_name_0", - "dictionary-source": "input", + "dictionary-name": "vfw_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-naming-policy", + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VPG_NAMING_TIMESTAMP" + } }, "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf_module_name", + "name": "int_private2_net_cidr", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf_module_name", - "dictionary-source": "input", + "dictionary-name": "int_private2_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-label", + "name": "vpg_onap_private_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-label", - "dictionary-source": "processor-db", + "dictionary-name": "vpg_onap_private_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "private-prefix-id", + "name": "vpg_int_private1_ip_0", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "private-prefix-id", - "dictionary-source": "processor-db", + "dictionary-name": "vpg_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vpg_private_ip_1", + "name": "vsn_int_private2_ip_0", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vpg_private_ip_1", - "dictionary-source": "input", + "dictionary-name": "vsn_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 } -] +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-template.vtl index 2ff6596ee..311cb94b8 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-template.vtl @@ -4,13 +4,10 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "vnf_model_customization_uuid", @@ -37,10 +34,6 @@ "param-value": "${aic-cloud-region}" }, { - "param-name": "vm-type", - "param-value": "${vm-type}" - }, - { "param-name": "vnfc-model-customization-uuid", "param-value": "${vfccustomizationuuid}" }, @@ -60,57 +53,22 @@ "param-name": "nfc-naming-code", "param-value": "${nfc-naming-code}" }, + { - "param-name": "cloud_env", - "param-value": "openstack" - }, - { - "param-name": "repo_url_artifacts", - "param-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "param-name": "repo_url_blob", - "param-value": "https://nexus.onap.org/content/repositories/raw" - }, - { - "param-name": "dcae_collector_port", - "param-value": "8080" - }, - { - "param-name": "image_name", - "param-value": "${image_name}" - }, - { - "param-name": "flavor_name", - "param-value": "m1.medium" - }, - { - "param-name": "key_name", - "param-value": "${key_name}" - }, - { - "param-name": "pub_key", - "param-value": "${pub_key}" - }, - { - "param-name": "install_script_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "demo_artifacts_version", - "param-value": "1.2.1-SNAPSHOT" + "param-name": "vpg_image_name", + "param-value": "${vpg_image_name}" }, { - "param-name": "dcae_collector_ip", - "param-value": "10.0.4.1" + "param-name": "vpg_flavor_name", + "param-value": "${vpg_flavor_name}" }, - { + { "param-name": "public_net_id", "param-value": "${public_net_id}" }, { - "param-name": "protected_private_net_id", - "param-value": "zdfw1fwl01_protected" + "param-name": "int_private1_net_cidr", + "param-value": "${int_private1_net_cidr}" }, { "param-name": "onap_private_net_id", @@ -121,49 +79,55 @@ "param-value": "${onap_private_subnet_id}" }, { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" + "param-name": "onap_private_net_cidr", + "param-value": "${onap_private_net_cidr}" }, { - "param-name": "unprotected_private_subnet_id", - "param-value": "${vnf-name}_unprotected_sub" + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" }, { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" + "param-name": "vfw_int_private1_ip_0", + "param-value": "${vfw_int_private1_ip_0}" }, { - "param-name": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" + "param-name": "vpg_int_private1_ip_0", + "param-value": "${vpg_int_private1_ip_0}" }, { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" + "param-name": "vsn_int_private2_ip_0", + "param-value": "${vsn_int_private2_ip_0}" }, { - "param-name": "onap_private_net_cidr", - "param-value": "${onap_private_net_cidr}" + "param-name": "demo_artifacts_version", + "param-value": "${demo_artifacts_version}}" }, { - "param-name": "vfw_private_ip_0", - "param-value": "${vfw_private_ip_0}" + "param-name": "install_script_version", + "param-value": "${install_script_version}}" }, - { - "param-name": "vsn_private_ip_0", - "param-value": "${vsn_private_ip_0}" + { + "param-name": "key_name", + "param-value": "${vnf_name}_key_name" }, - { - "param-name": "nexus_artifact_repo", - "param-value": "${nexus_artifact_repo}" + { + "param-name": "cloud_env", + "param-value": "$(cloud_env)" }, - { + { "param-name": "sec_group", "param-value": "${sec_group}" }, - { - "param-name": "vpg_private_ip_0", - "param-value": "${vpg_private_ip_0}" + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" + }, + { + "param-name": "vpg_onap_private_ip_0", + "param-value": "${vpg_onap_private_ip_0}" } + + ], "capability-data": [ { @@ -188,16 +152,12 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNFC" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "NFC_NAMING_CODE", @@ -215,15 +175,15 @@ "payload": [ { "param-name": "resource-name", - "param-value": "vf_module_name" + "param-value": "vf-module-name" }, { "param-name": "resource-value", - "param-value": "${vf_module_name}" + "param-value": "${vf-module-name}" }, { "param-name": "external-key", - "param-value": "${vf-module-id}_vf_module_name" + "param-value": "${vf-module-id}_vf-module-name" }, { "param-name": "policy-instance-name", @@ -239,7 +199,7 @@ }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "VF_MODULE_LABEL", @@ -252,44 +212,14 @@ ], "output-key-mapping": [ { - "resource-name": "vf_module_name", - "resource-value": "${vf_module_name}" - } - ] - } - ] - }, - { - "capability-name": "netbox-ip-assign", - "key-mapping": [ - { - "payload": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "prefix-id", - "param-value": "${private-prefix-id}" - }, - { - "param-name": "vf-module-id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "external_key", - "param-value": "${vf-module-id}-vpg_private_ip_1" - } - ], - "output-key-mapping": [ - { - "resource-name": "vpg_private_ip_1", - "resource-value": "${vpg_private_ip_1}" + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" } ] } ] }, + { "capability-name": "aai-vf-module-put", "key-mapping": [ @@ -298,10 +228,6 @@ { "param-name": "vf-module", "param-value": "vf-module" - }, - { - "param-name": "vnfc", - "param-value": "vnfc" } ], "output-key-mapping": [ @@ -312,27 +238,6 @@ ] } ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "vf-module-name", - "resource-value": "${vf_module_name}" - }, - { - "resource-name": "vnfc-name", - "resource-value": "${vpg_name_0}" - }, - { - "resource-name": "ipv4-oam-address-prefix", - "resource-value": "${onap_private_net_cidr}" - } - ] - } - ] } ] }
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json index 3d9c0370c..532e157f6 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json @@ -1,360 +1,364 @@ [ { - "name": "service-instance-id", + "name": "cloud_env", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "openstack" + }, + "input-param": false, + "dictionary-name": "cloud_env", + "dictionary-source": "default", + "dependencies": [], + "version": 0 + }, + { + "name": "nexus_artifact_repo", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", + "dictionary-name": "nexus_artifact_repo", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, + { - "name": "vnf-id", + "name": "vf-module-name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "${vf-module-name}" }, "input-param": false, - "dictionary-name": "vnf-id", - "dictionary-source": "input", - "dependencies": [ - - ], + "dictionary-name": "vf-module-name", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "vnf-name", + "name": "nfc-naming-code", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", - "dictionary-source": "sdnc", + "dictionary-name": "nfc-naming-code", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vnf-model-customization-uuid", + "name": "dcae_collector_ip", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "10.0.4.1" }, "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "dcae_collector_ip", + "dictionary-source": "default", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-id", + "name": "dcae_collector_port", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "30235" }, "input-param": false, - "dictionary-name": "vf-module-id", - "dictionary-source": "input", + "dictionary-name": "dcae_collector_port", + "dictionary-source": "default", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-type", + "name": "demo_artifacts_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-type", - "dictionary-source": "processor-db", + "dictionary-name": "demo_artifacts_version", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, + { - "name": "vf-module-model-customization-uuid", + "name": "install_script_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "install_script_version", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vfccustomizationuuid", + "name": "vnf_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfccustomizationuuid", - "dictionary-source": "processor-db", + "dictionary-name": "vnf_name", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "aic-cloud-region", + "name": "onap_private_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", + "dictionary-name": "onap_private_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vm-type", + "name": "onap_private_net_id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vm-type", - "dictionary-source": "processor-db", + "dictionary-name": "onap_private_net_id", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-invariant-uuid", + "name": "int_private2_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-invariant-uuid", - "dictionary-source": "processor-db", + "dictionary-name": "int_private2_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-version", + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-version", - "dictionary-source": "processor-db", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nf-role", + "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "vSN" + } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "default", + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "sdnc", "dependencies": [ - "vnf-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nfc-naming-code", + "name": "public_net_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nfc-naming-code", - "dictionary-source": "processor-db", + "dictionary-name": "public_net_id", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "image_name", + "name": "sec_group", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "image_name", + "dictionary-name": "sec_group", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -363,124 +367,125 @@ "version": 0 }, { - "name": "public_net_id", + "name": "service-instance-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "value": "public_net_id", - "default": "public_net_id" + } }, "input-param": false, - "dictionary-name": "public_net_id", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "key_name", + "name": "vf-module-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "key_name", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "vf-module-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "pub_key", + "name": "vf-module-label", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "pub_key", - "dictionary-source": "sdnc", + "dictionary-name": "vf-module-label", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "onap_private_net_id", + "name": "vf-module-model-customization-uuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_id", - "dictionary-source": "sdnc", + "dictionary-name": "vf-module-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "vf-module-type", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vf-module-type", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "onap_private_subnet_id", + "name": "vf-naming-policy", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_subnet_id", + "dictionary-name": "vf-naming-policy", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -489,320 +494,307 @@ "version": 0 }, { - "name": "unprotected_private_net_cidr", + "name": "vfccustomizationuuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", + "dictionary-name": "vfccustomizationuuid", "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, + { - "name": "protected_private_net_cidr", + "name": "vsn_flavor_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "protected_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "flavor_name", + "dictionary-source": "sdnc", "dependencies": [ - - ], + "service-instance-id", + "vnf-id" + ], "version": 0 }, { - "name": "onap_private_net_cidr", + "name": "vsn_image_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "image_name", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nexus_artifact_repo", + "name": "vsn_name_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" }, - "value": "nexus_artifact_repo", - "default": "nexus_artifact_repo" + "default": "${vsn_name_0}" }, "input-param": false, - "dictionary-name": "nexus_artifact_repo", + "dictionary-name": "vsn_name_0", "dictionary-source": "default", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "sec_group", + "name": "vnf-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "onap_sg_PUhf" + } }, "input-param": false, - "dictionary-name": "sec_group", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vnf-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "vfw_private_ip_1", + "name": "vnf-model-customization-uuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfw_private_ip_1", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "vnf-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "vsn_name_0", + "name": "vnfc-model-invariant-uuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vsn_name_0", - "dictionary-source": "input", + "dictionary-name": "vnfc-model-invariant-uuid", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vf-naming-policy", + "name": "vnfc-model-version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP" + } }, "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", + "dictionary-name": "vnfc-model-version", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vf_module_name", + "name": "vsn_int_private2_ip_0", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf_module_name", - "dictionary-source": "input", + "dictionary-name": "vsn_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-label", + "name": "vfw_int_private2_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-label", - "dictionary-source": "processor-db", + "dictionary-name": "vfw_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "private-prefix-id", + "name": "vsn_onap_private_ip_0", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "${vsn_onap_private_ip_0}" }, "input-param": false, - "dictionary-name": "private-prefix-id", - "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dictionary-name": "vsn_onap_private_ip_0", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "vsn_private_ip_1", + "name": "private1-prefix-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vsn_private_ip_1", - "dictionary-source": "input", - "dependencies": [ + "dictionary-name": "private1-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + }, + { + "name": "management-prefix-id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } - ], + }, + "input-param": false, + "dictionary-name": "management-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], "version": 0 }, { - "name": "protected-prefix-id", + "name": "private2-prefix-id", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "protected-prefix-id", + "dictionary-name": "private2-prefix-id", "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dependencies": [], "version": 0 } -] +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl index 11fcea9fd..7faf97739 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl @@ -4,13 +4,10 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "vnf_model_customization_uuid", @@ -36,10 +33,7 @@ "param-name": "aic-cloud-region", "param-value": "${aic-cloud-region}" }, - { - "param-name": "vm-type", - "param-value": "${vm-type}" - }, + { "param-name": "vnfc-model-customization-uuid", "param-value": "${vfccustomizationuuid}" @@ -53,72 +47,28 @@ "param-value": "${vnfc-model-version}" }, { - "param-name": "nfc-function", - "param-value": "${nf-role}" - }, - { "param-name": "nfc-naming-code", "param-value": "${nfc-naming-code}" }, + { - "param-name": "cloud_env", - "param-value": "openstack" - }, - { - "param-name": "repo_url_artifacts", - "param-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "param-name": "repo_url_blob", - "param-value": "https://nexus.onap.org/content/repositories/raw" - }, - { - "param-name": "dcae_collector_port", - "param-value": "8080" - }, - { - "param-name": "image_name", - "param-value": "${image_name}" - }, - { - "param-name": "flavor_name", - "param-value": "m1.medium" - }, - { - "param-name": "install_script_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "key_name", - "param-value": "${key_name}" - }, - { - "param-name": "pub_key", - "param-value": "${pub_key}" + "param-name": "vsn_image_name", + "param-value": "${vsn_image_name}" }, { - "param-name": "demo_artifacts_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "dcae_collector_ip", - "param-value": "10.0.4.1" + "param-name": "vsn_flavor_name", + "param-value": "${vsn_flavor_name}" }, { "param-name": "public_net_id", "param-value": "${public_net_id}" - }, + }, + + + { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" - }, - { - "param-name": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" - }, - { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" }, { "param-name": "onap_private_net_id", @@ -128,30 +78,45 @@ "param-name": "onap_private_subnet_id", "param-value": "${onap_private_subnet_id}" }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" - }, - { - "param-name": "protected_private_net_cidr", - "param-value": "${protected_private_net_cidr}" - }, - { + { "param-name": "onap_private_net_cidr", "param-value": "${onap_private_net_cidr}" }, { - "param-name": "nexus_artifact_repo", - "param-value": "${nexus_artifact_repo}" + "param-name": "vfw_int_private2_ip_0", + "param-value": "${vfw_int_private2_ip_0}" }, - { + { + "param-name": "vsn_int_private2_ip_0", + "param-value": "${vsn_int_private2_ip_0}" + }, + { + "param-name": "demo_artifacts_version", + "param-value": "${demo_artifacts_version}" + }, + { + "param-name": "install_script_version", + "param-value": "${install_script_version}" + }, + { + "param-name": "key_name", + "param-value": "${vnf_name}_key_name" + }, + { + "param-name": "cloud_env", + "param-value": "openstack" + }, + { "param-name": "sec_group", "param-value": "${sec_group}" }, - { - "param-name": "vfw_private_ip_1", - "param-value": "${vfw_private_ip_1}" + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" } + + + ], "capability-data": [ { @@ -176,16 +141,12 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNFC" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "NFC_NAMING_CODE", @@ -203,31 +164,27 @@ "payload": [ { "param-name": "resource-name", - "param-value": "vf_module_name" + "param-value": "vf-module-name" }, { "param-name": "resource-value", - "param-value": "${vf_module_name}" + "param-value": "${vf-module-name}" }, { "param-name": "external-key", - "param-value": "${vf-module-id}_vf_module_name" + "param-value": "${vf-module-id}_vf-module-name" }, { "param-name": "policy-instance-name", "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VF-MODULE" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "VF_MODULE_LABEL", @@ -240,8 +197,8 @@ ], "output-key-mapping": [ { - "resource-name": "vf_module_name", - "resource-value": "${vf_module_name}" + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" } ] } @@ -258,21 +215,21 @@ }, { "param-name": "prefix-id", - "param-value": "${private-prefix-id}" + "param-value": "${management-prefix-id}" }, { - "param-name": "vf-module-id", + "param-name": "vf_module_id", "param-value": "${vf-module-id}" }, { "param-name": "external_key", - "param-value": "${vf-module-id}-vsn_private_ip_1" + "param-value": "${vf-module-id}-vsn_onap_private_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vsn_private_ip_1", - "resource-value": "${vsn_private_ip_1}" + "resource-name": "vsn_onap_private_ip_0", + "resource-value": "${vsn_onap_private_ip_0}" } ] } @@ -286,10 +243,6 @@ { "param-name": "vf-module", "param-value": "vf-module" - }, - { - "param-name": "vnfc", - "param-value": "vnfc" } ], "output-key-mapping": [ @@ -300,35 +253,6 @@ ] } ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "volume-group-name", - "resource-value": "${volume_group_name}" - }, - { - "resource-name": "vf-module-name", - "resource-value": "${vf_module_name}" - }, - { - "resource-name": "vnfc-name", - "resource-value": "${vsn_name_0}" - }, - { - "resource-name": "ipv4-oam-address", - "resource-value": "${vsn_private_ip_1}" - }, - { - "resource-name": "ipv4-oam-address-prefix", - "resource-value": "${onap_private_net_cidr}" - } - ] - } - ] } ] }
\ No newline at end of file diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json index 72304692e..93f86129a 100755 --- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json @@ -1,56 +1,38 @@ { - "tags": "vnf-name", - "name": "vnf-name", - "group":"default", - "property": { - "description": "vnf-name", - "type": "string" - }, - "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>", - "sources": { - "input": { - "type": "source-input" - }, - "default": { - "type": "source-default", - "properties": {} - }, - "sdnc": { - "type": "source-rest", - "properties": { - "type": "JSON", - "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name", - "path": "/param/0/value", - "input-key-mapping": { - "service-instance-id": "service-instance-id", - "vnf-id": "vnf-id" - }, - "output-key-mapping": { - "vnf-name": "value" - }, - "key-dependencies": [ - "service-instance-id", - "vnf-id" - ] - } - }, - "aai-data": { - "type": "source-rest", - "properties": { - "type": "JSON", - "verb": "GET", - "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id", - "path": "", - "input-key-mapping": { - "vnf-id": "vnf-id" - }, - "output-key-mapping": { - "vnf-name": "vnf-name" - }, - "key-dependencies": [ - "vnf-id" - ] - } - } - } -} + "tags": "vnf-name", + "name": "vnf-name", + "property": { + "description": "vnf-name", + "type": "string" + }, + "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + }, + "sdnc": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name", + "path": "/param/0/value", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "vnf-id" + }, + "output-key-mapping": { + "vnf-name": "value" + }, + "key-dependencies": [ + "service-instance-id", + "vnf-id" + ] + } + } + } +}
\ No newline at end of file diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json index cd6bb42e7..72a2db395 100755 --- a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_name_0.json @@ -1,16 +1,38 @@ { - "name" : "vpg_name_0", - "tags" : "vpg_name_0", - "group":"default", - "updated-by" : "Singal, Kapil <ks220y@att.com>", - "property" : { - "description" : "vpg_name_0", - "type" : "string" - }, - "sources" : { - "input" : { - "type" : "source-input", - "properties" : { } - } - } + "tags": "vpg_name_0", + "name": "vpg_name_0", + "property": { + "description": "vpg_name_0", + "type": "string" + }, + "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + }, + "sdnc": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_name_0", + "path": "/param/0/value", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "vnf-id" + }, + "output-key-mapping": { + "vpg_name_0": "value" + }, + "key-dependencies": [ + "service-instance-id", + "vnf-id" + ] + } + } + } } |
