diff options
Diffstat (limited to 'epsdk-app-onap')
| -rwxr-xr-x | epsdk-app-onap/pom.xml | 6 | ||||
| -rwxr-xr-x | epsdk-app-onap/src/main/resources/catalog.json | 174 | ||||
| -rwxr-xr-x | epsdk-app-onap/src/main/resources/sampleTosca.csar | bin | 6337 -> 0 bytes | |||
| -rwxr-xr-x | epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties | 2 | ||||
| -rwxr-xr-x | epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties | 2 |
5 files changed, 5 insertions, 179 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index 8f63a6d0c..0dc8eacea 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -25,9 +25,9 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <epsdk.version>2.5.0</epsdk.version> - <jackson.version>2.9.9</jackson.version> - <jackson.databind.version>2.9.9.3</jackson.databind.version> - <springframework.version>5.1.9.RELEASE</springframework.version> + <jackson.version>2.10.1</jackson.version> + <jackson.databind.version>2.10.1</jackson.databind.version> + <springframework.version>5.2.0.RELEASE</springframework.version> <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5: org.springframework.orm.hibernate4.HibernateTransactionManager so following orm.version lets epsdk-core find it --> diff --git a/epsdk-app-onap/src/main/resources/catalog.json b/epsdk-app-onap/src/main/resources/catalog.json deleted file mode 100755 index e5fb52136..000000000 --- a/epsdk-app-onap/src/main/resources/catalog.json +++ /dev/null @@ -1,174 +0,0 @@ -{
- "services": {
- "0346aa9f-57b7-458a-9681-daf5b19d52b0": {
- "uuid": "0346aa9f-57b7-458a-9681-daf5b19d52b0",
- "name": "The Worst Service",
- "version": "1.0",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Bad Services",
- "lifecycleState": "NOT_CERTIFIED_CHECKOUT",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_REJECTED",
- "artifacts": [],
- "resources": []
- },
- "1346aa9f-57b7-458a-9681-daf5b19d52b1": {
- "uuid": "1346aa9f-57b7-458a-9681-daf5b19d52b1",
- "name": "The Worst Service",
- "version": "1.1",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Bad Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTED",
- "artifacts": [],
- "resources": []
- },
- "3346aa9f-57b7-458a-9681-daf5b19d52b3": {
- "uuid": "3346aa9f-57b7-458a-9681-daf5b19d52b3",
- "name": "Bland Service",
- "version": "1.9",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Neutral Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_NOT_APPROVED",
- "artifacts": [],
- "resources": []
- },
- "2346aa9f-57b7-458a-9681-daf5b19d52b2": {
- "uuid": "2346aa9f-57b7-458a-9681-daf5b19d52b2",
- "name": "The Best Service",
- "version": "1.3",
- "toscaModelURL": "sampleTosca.csar",
- "category": "Good Services",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "distributionStatus": "DISTRIBUTION_APPROVED",
- "artifacts": [
- {
- "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- }
- ],
- "resources": []
- }
- },
- "resources": {
- "2f92b5b0-10ff-4cf4-9531-88546fe88a42": {
- "uuid": "2f92b5b0-10ff-4cf4-9531-88546fe88a42",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": [
- {
- "artifactUUID": "0cf78c81-1246-45e7-a190-eaa309ee5680",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "1cf78c81-1246-45e7-a190-eaa309ee5681",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- },
- {
- "artifactUUID": "2cf78c81-1246-45e7-a190-eaa309ee5682",
- "generatedFromUUID": "3cf78c81-1246-45e7-a190-eaa309ee5680",
- "artifactName": "The Worst Artifact",
- "artifactType": "HEAT",
- "artifactDescription": "This is the worst artifact",
- "artifactURL": "http://www.openecomp.org/",
- "artifactTimeout": "60",
- "artifactChecksum": "A worthy checksum",
- "artifactVersion": "0.1",
- }
- ]
- },
- "0f92b5b0-10ff-4cf4-9531-88546fe88a40": {
- "uuid": "0f92b5b0-10ff-4cf4-9531-88546fe88a40",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": []
- },
- "1f92b5b0-10ff-4cf4-9531-88546fe88a41": {
- "uuid": "1f92b5b0-10ff-4cf4-9531-88546fe88a41",
- "invariantUUID": "df92b5b0-10ff-4cf4-9531-88546fe88a4d",
- "name": "The Worst Resource",
- "version": "0.1",
- "toscaModelURL": "sampleTosca.csar",
- "toscaModel": "http://www.openecomp.org/",
- "toscaResourceName": "The Worst Resource (TOSCA)",
- "category": "Bad Resources",
- "subCategory": "Really Bad Resources",
- "resourceType": "VF",
- "lifecycleState": "CERTIFIED",
- "lastUpdaterUserId": "example@example.org",
- "lastUpdaterFullName": "Example User",
- "artifacts": []
- }
- }
-}
\ No newline at end of file diff --git a/epsdk-app-onap/src/main/resources/sampleTosca.csar b/epsdk-app-onap/src/main/resources/sampleTosca.csar Binary files differdeleted file mode 100755 index 7532f5874..000000000 --- a/epsdk-app-onap/src/main/resources/sampleTosca.csar +++ /dev/null diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties index 5454724bf..393327d85 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -136,7 +136,7 @@ mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.c mso.displayTestAPIOnScreen=true mso.defaultTestAPI=VNF_API -mso.maxOpenedInstantiationRequests=20 +mso.maxOpenedInstantiationRequests=200 mso.asyncPollingIntervalSeconds=1 refreshTimeInstantiationDashboard=10 diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties index 0987199e3..1e8a0ba15 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties @@ -136,7 +136,7 @@ mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.c mso.displayTestAPIOnScreen=true mso.defaultTestAPI=GR_API -mso.maxOpenedInstantiationRequests=20 +mso.maxOpenedInstantiationRequests=200 mso.asyncPollingIntervalSeconds=1 refreshTimeInstantiationDashboard=10 |