From b1e5734ef566af5d49ba17d05ca0ab7b56d6666d Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Tue, 9 May 2017 03:55:30 -0700 Subject: [MSO-8] Additional fixes for the second rebase DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file not reloaded properly when it's wrong (JSON error or model hierarchy mistake) at MSO startup Change-Id: I2853030b78499e2a761706b643ea210955e72de3 Signed-off-by: Determe, Sebastien (sd378r) [MSO-8] Restore files removed in patch set 2 Those groovy files must be there Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04 Signed-off-by: Determe, Sebastien (sd378r) --- .../src/test/resources/SoapUI/Healthcheck-soapui-project.xml | 8 ++++---- .../bulkload-files/default/create_mso_db-default.sql | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml index 2d3424c784..6215d0c5ea 100644 --- a/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml +++ b/packages/arquillian-unit-tests/src/test/resources/SoapUI/Healthcheck-soapui-project.xml @@ -1,12 +1,13 @@ -http://localhost:8080enabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 404htmltext/plain200dataapplication/jsontext/plain500datatext/html200html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0datatext/plain500data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 403htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNamehttp://localhost:8080enableBpmnQUERY0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheckNo AuthorizationenableBpmnenableBpmnQUERY0data0data0datatext/html503htmltext/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheckNo AuthorizationenableBpmnhttp://${#Project#jrahost}text/html200htmltext/html503html0data0data0data0datatext/html;charset=utf-8500html<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheckNo Authorizationtext/html200htmltext/html503html<xml-fragment/>truehttp://${#Project#jrahost}http://localhost/adapters/rest/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8500 404html<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/rest/healthcheckNo Authorization0data0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheckNo Authorizationtext/html200htmltext/html503html0data<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404 405htmlapplication/json200heal:Response0data0data0datatext/html200htmltext/html404html<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheckNo Authorizationtext/html200htmltext/html503html0data0data0data0data200data200data200data200data0data0data0data0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404htmlapplication/json200heal:Response0data0data0data<xml-fragment/>http://${#Project#bpmnhost}{"variables":{"requestId":{"value":"test","type":"String"}}}localhost/mso/async/services/HealthCheckNo Authorizationtext/html200htmlhttp://${#Project#jrahost}No Authorizationhttp://192.168.126.130:8080text/xml;charset=ISO-8859-1200soapenv:Envelopeapplication/xmlsoapenv:Envelopetext/xml;charset=ISO-8859-1500soapenv:Envelopetext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost} +http://localhost:8080enabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 404htmltext/plain200dataapplication/jsontext/plain500datatext/html200html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}No AuthorizationenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 401 403htmltext/plain200dataapplication/json0datatext/plain500data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 401htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404htmltext/plain200dataapplication/json<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNameenabletrueQUERYtruesiteName${#Project#sitename}TEMPLATE${#Project#sitename}text/html;charset=utf-8405 404 403htmltext/plain200dataapplication/jsontext/plain500data0data<xml-fragment/>http://${#Project#jrahost}http://localhost/ecomp/mso/infra/setStatus${#Project#userlogin}${#Project#userpassword}BasicBasicGlobal HTTP SettingsenablesiteNamehttp://localhost:8080enableBpmnQUERY0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/globalhealthcheckNo AuthorizationenableBpmnenableBpmnQUERY0data0data0datatext/html503htmltext/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheckNo AuthorizationenableBpmnhttp://${#Project#jrahost}text/html200htmltext/html503html0data0data0data0datatext/html;charset=utf-8500html<xml-fragment/>http://${#Project#jrahost}http://localhost/networks/admin/healthcheckNo Authorizationtext/html200htmltext/html503html<xml-fragment/>truehttp://${#Project#jrahost}http://localhost/adapters/rest/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8500 404html<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/rest/healthcheckNo Authorization0data0datatext/html200htmltext/html503html<xml-fragment/>http://${#Project#jrahost}http://localhost/tenants/admin/healthcheckNo Authorizationtext/html200htmltext/html503html0datatext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/healthcheckNo Authorizationtext/html200htmltext/html503html0data<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404 405htmlapplication/json200heal:Response0data0data0datatext/html200htmltext/html404html<xml-fragment/>http://${#Project#bpmnhost}{"variables":{}}localhost/mso/async/services/HealthCheckNo Authorizationtext/html200htmltext/html503html0data0data0data0data200data200data200data200data0data0data0data0data0data<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/healthcheckNo Authorizationnot used in Arquilian as not same repoapplication/jsonapplication/json500 503heal:Faulttext/html;charset=utf-8400 404htmlapplication/json200heal:Response0data0data0data<xml-fragment/>http://${#Project#bpmnhost}{"variables":{"requestId":{"value":"test","type":"String"}}}localhost/mso/async/services/HealthCheckNo Authorizationtext/html200htmlhttp://${#Project#jrahost}No Authorizationhttp://192.168.126.130:8080text/xml;charset=ISO-8859-1200soapenv:Envelopeapplication/xmlsoapenv:Envelopetext/xml;charset=ISO-8859-1500soapenv:Envelopetext/html;charset=utf-8404html<xml-fragment/>http://${#Project#apihhost} ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapterNo Authorizationhttp://localhost:8080text/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheckNo Authorizationtext/html200htmltext/html;charset=utf-8401htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheckNo Authorization0datatext/html200htmlhttp://localhost:8080No AuthorizationenableQUERYhttp://${#Project#jrahost}No AuthorizationenableenableQUERYtext/plain200datahttp://${#Project#jrahost}No AuthorizationenableenableQUERYhttp://${#Project#jrahost}No AuthorizationenableenableQUERYhttp://${#Project#jrahost}No AuthorizationenableenableQUERYhttp://${#Project#apihhost}No AuthorizationenableenableQUERYhttp://${#Project#apihhost}No AuthorizationenableenableQUERYhttp://${#Project#apihhost}No AuthorizationenableSEQUENTIAL<xml-fragment/>http://${#Project#apihhost} +]]>http://localhost/dbadapters/RequestsDbAdapterNo Authorizationhttp://localhost:8080text/html200html<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/nodehealthcheckNo Authorizationtext/html200htmltext/html;charset=utf-8401htmltext/html503html<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheckNo Authorization0datatext/html200htmlhttp://localhost:8080No AuthorizationenableQUERYhttp://${#Project#jrahost}No AuthorizationenableenableQUERYtext/plain200datahttp://${#Project#jrahost}No AuthorizationenableenableQUERYhttp://${#Project#jrahost}No AuthorizationenableenableQUERYhttp://${#Project#jrahost}No AuthorizationenableenableQUERYhttp://${#Project#apihhost}No AuthorizationenableenableQUERYhttp://${#Project#apihhost}No AuthorizationenableenableQUERYhttp://${#Project#apihhost}No AuthorizationenableenableQUERY<xml-fragment/>http://${#Project#bpmnhost}No AuthorizationenableSEQUENTIAL<xml-fragment/>http://${#Project#apihhost}http://localhost/dbadapters/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>UTF-8http://${#Project#jrahost}http://localhost/networks/rest/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#jrahost}http://localhost/tenantss/rest/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/rest/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/logging/debug200 +${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#apihhost} @@ -111,5 +112,4 @@ ${#Project#sitename} -]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck200No AuthorizationenableBpmnhttp://${#Project#jrahost}http://localhost/tenants/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck200No Authorization<xml-fragment/>UTF-8http://${#Project#jrahost}http://localhost/networks/rest/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>UTF-8http://${#Project#jrahost}http://localhost/tenantss/rest/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#jrahost}http://localhost/vnfs/rest/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/logging/debug200 -${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#apihhost}http://localhost/ecomp/mso/infra/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenable<xml-fragment/>http://${#Project#apihhost}http://localhost/dbadapters/logging/debug200${#Project#msoclient}${#Project#msoclientpassword}BasicBasicGlobal HTTP Settingsenableapihhostlocalhost:8080jrahostlocalhost:8080userloginsitecontroluserpasswordDomain2.0!bpmnhostlocalhost:8080sitenamemso-dockerenableBpmndbadapteruserBPELClientdbadapterpasswordpassword1$msoclientMSOClientmsoclientpasswordpassword1$ \ No newline at end of file +]]>http://localhost/dbadapters/RequestsDbAdapter<return>true</return>falsefalse${#Project#dbadapteruser}${#Project#dbadapterpassword}BasicBasicGlobal HTTP Settings<xml-fragment/>http://${#Project#apihhost}http://localhost/adapters/rest/nodehealthcheck200No Authorization<xml-fragment/>http://${#Project#jrahost}http://localhost/adapters/rest/globalhealthcheck200No AuthorizationenableBpmnhttp://${#Project#jrahost}http://localhost/tenants/admin/healthcheck200No Authorization<xml-fragment/>http://${#Project#apihhost}http://localhost/asdc/healthcheck200No Authorizationapihhostlocalhost:8080jrahostlocalhost:8080userloginsitecontroluserpasswordDomain2.0!bpmnhostlocalhost:8080sitenamemso-dockerenableBpmndbadapteruserBPELClientdbadapterpasswordpassword1$msoclientMSOClientmsoclientpasswordpassword1$ \ No newline at end of file diff --git a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql index 6bda994174..2165041f5c 100644 --- a/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql +++ b/packages/root-pack-extras/config-resources/mariadb/db-sql-scripts/bulkload-files/default/create_mso_db-default.sql @@ -84,8 +84,8 @@ INSERT INTO `VNF_COMPONENTS_RECIPE` UNLOCK TABLES; INSERT INTO service (id, SERVICE_NAME, VERSION_STR, DESCRIPTION, SERVICE_NAME_VERSION_ID) VALUES ('4', 'VID_DEFAULT', '1.0', 'Default service for VID to use for infra APIH orchestration', 'MANUAL_RECORD'); -INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateServiceInstance', '180'); -INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DelServiceInstance', '180'); +INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'createInstance', '1', 'VID_DEFAULT recipe to create service-instance if no custom BPMN flow is found', '/mso/async/services/CreateGenericALaCarteServiceInstance', '180'); +INSERT INTO service_recipe (SERVICE_ID, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('4', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete service-instance if no custom BPMN flow is found', '/mso/async/services/DeleteGenericALaCarteServiceInstance', '180'); INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'createInstance', '1', 'VID_DEFAULT recipe to create VNF if no custom BPMN flow is found', '/mso/async/services/CreateVnfInfra', '180'); INSERT INTO vnf_recipe (VNF_TYPE, ACTION, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) VALUES ('VID_DEFAULT', 'deleteInstance', '1', 'VID_DEFAULT recipe to delete VNF if no custom BPMN flow is found', '/mso/async/services/DeleteVnfInfra', '180'); INSERT INTO vnf_components_recipe (VNF_TYPE, VNF_COMPONENT_TYPE, ACTION, VERSION, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT, VF_MODULE_ID) VALUES (NULL, 'volumeGroup', 'createInstance', '1', 'VID_DEFAULT recipe to create volume-group if no custom BPMN flow is found', '/mso/async/services/CreateVfModuleVolumeInfraV1', '180', 'VID_DEFAULT'); -- cgit 1.2.3-korg