From 68bf7207a2097a0313c272e5a851373bfe69761d Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Mon, 30 Oct 2017 20:18:11 +0200 Subject: [PATCH] New normativeType Allotted Resource & Recepies Change-Id: I0602cec92497bbf0b926996b88ccbe6b3f02bbef Issue-ID:SDC-556 Signed-off-by: Tal Gitelman --- .../allottedResource/allottedResource.json | 20 +++++++++++ .../allottedResource/allottedResource.yml | 38 +++++++++++++++++++++ .../allottedResource/allottedResource.zip | Bin 0 -> 608 bytes sdc-os-chef/scripts/docker_run.sh | 6 ++-- ...BE_5_jetty_Modules.rb => BE_4_jetty_Modules.rb} | 0 ...lasticsearch.rb => BE_5_setup_elasticsearch.rb} | 0 ...operties.rb => BE_6_setup_portal_properties.rb} | 0 .../recipes/{BE_8_logback.rb => BE_7_logback.rb} | 0 ...BE_9_errors_config.rb => BE_8_errors_config.rb} | 0 ...s.rb => BE_Number_create_DMaaP_keys.rb-NotUsed} | 0 ...ormatives.rb => BE_Number_import_Normatives.rb} | 0 .../sdc-normatives/recipes/import_Normatives.rb | 2 +- .../sdc-backend/chef-solo/roles/catalog-be.json | 10 +++--- 13 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json create mode 100644 catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml create mode 100644 catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.zip rename sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/{BE_5_jetty_Modules.rb => BE_4_jetty_Modules.rb} (100%) rename sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/{BE_6_setup_elasticsearch.rb => BE_5_setup_elasticsearch.rb} (100%) rename sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/{BE_7_setup_portal_properties.rb => BE_6_setup_portal_properties.rb} (100%) rename sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/{BE_8_logback.rb => BE_7_logback.rb} (100%) rename sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/{BE_9_errors_config.rb => BE_8_errors_config.rb} (100%) rename sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/{BE_4_create_DMaaP_keys.rb => BE_Number_create_DMaaP_keys.rb-NotUsed} (100%) rename sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/{BE_10_import_Normatives.rb => BE_Number_import_Normatives.rb} (100%) diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json new file mode 100644 index 0000000000..143f62346d --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json @@ -0,0 +1,20 @@ +{ + "payloadName": "allottedResource.yml", + "contactId": "jh0003", + "name": "AllottedResource", + "description": "Allotted Resource base type all other allotted resources node types derive from", + "resourceIconPath": "defaulticon", + "categories": [ + { + "name": "Allotted Resource", + "subcategories": [ + { + "name": "Allotted Resource" + } + ] + } +], + "tags": [ + "AllottedResource" + ] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml new file mode 100644 index 0000000000..00d3bd243d --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml @@ -0,0 +1,38 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.vfc.AllottedResource: + derived_from: tosca.nodes.Root + description: ECOMP Allotted Resource base type all other allotted resources node types derive from + properties: + providing_service_uuid: + type: string + required: true + description: The depending service uuid in order to map the allotted resource to the specific service version + providing_service_invariant_uuid: + type: string + required: true + description: The depending service invariant uuid in order to map the allotted resource to the specific service version + providing_service_name: + type: string + required: true + description: The depending service name in order to map the allotted resource to the specific service version + role: + type: string + required: true + description: Unique label that defines the role that this allotted resource performs + min_instances: + type: integer + default: 1 + max_instances: + type: integer + default: 1 + target_network_role: + type: string + required: true + description: Target network role + requirements: + - service_dependency: + capability: org.openecomp.capabilities.AllottedResource + relationship: tosca.relationships.DependsOn + node: tosca.services.Root + diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.zip b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.zip new file mode 100644 index 0000000000000000000000000000000000000000..fd3f7e9d79472c41908ab58d77d7f60ec335f25e GIT binary patch literal 608 zcmWIWW@Zs#U|`^2*w7K@{f$dOc@rZ8!!cF{29RiCPELMFNoq<^YH@yPQF5wYWp2*i zkh6VP40!hSo4kJ@zTnp0bG(f1TQauJS?u%bT*MMjvoh|_-z+kN-FW8ASlX_&Y3}>u zo;nlfn%eS-cxbSh8K+%4$~aBr@(i0<-LiWtP57TB?&sdL zUS25~8C_)&)r7t68tG?tMXjDC#CA09RK?P^Lwi0fS#xXig{(B*vsZ#GB#+rlb~g6C zlApOEfIZ=4)MnSI?@Jf;?6o>2toKn`T|fOwL)q#Fhr9S$zzauUj6x72F#X z-S}(L#O}UR!Ha(>|7(uh`@{K+viX;ZO>x3v(qFFL(O9BTai~T&b;IQ8%r^Q3~A{?;q_@A?P)(7j0N`yVQG%M(5_V*6QS&z!!J~&e(ZLs6?RIc>Nwv*I%%GAxS z)eT;D^6Z=4VsCQiZcX>f{S$k9$M1;BpPD(dU-4ug?cS3c^RC>UF~FOV$sQb^*kV}) x7|$S}04A}=ITuuxkwJo?(fm!@guu&;Kb2AG0B=?{kP(bPm /var/lib/jetty/logs/importNormativeAll.log + python importNormativeAll.py --debug=true -i localhost > /var/lib/jetty/logs/importNormativeAll.log EOH end diff --git a/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json b/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json index a05a2830eb..220eee7c92 100644 --- a/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json +++ b/sdc-os-chef/sdc-backend/chef-solo/roles/catalog-be.json @@ -13,11 +13,11 @@ "recipe[sdc-catalog-be::BE_1_cleanup_jettydir]", "recipe[sdc-catalog-be::BE_2_setup_configuration]", "recipe[sdc-catalog-be::BE_3_locate_keystore]", - "recipe[sdc-catalog-be::BE_5_jetty_Modules]", - "recipe[sdc-catalog-be::BE_6_setup_elasticsearch]", - "recipe[sdc-catalog-be::BE_7_setup_portal_properties]", - "recipe[sdc-catalog-be::BE_8_logback]", - "recipe[sdc-catalog-be::BE_9_errors_config]" + "recipe[sdc-catalog-be::BE_4_jetty_Modules]", + "recipe[sdc-catalog-be::BE_5_setup_elasticsearch]", + "recipe[sdc-catalog-be::BE_6_setup_portal_properties]", + "recipe[sdc-catalog-be::BE_7_logback]", + "recipe[sdc-catalog-be::BE_8_errors_config]" ], "env_run_lists": { } -- 2.16.6