From f4dff328c0386c8901b5841943b11f0c13b3169f Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 8 Jul 2019 15:46:44 +0300 Subject: Merge from ecomp 718fd196 - Integration Tests Issue-ID: VID-378 Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489 Signed-off-by: Ittay Stern --- .../ServiceTreeForRetry_serviceInstance.json | 2 + .../ServiceWithFailedServiceInstance.json | 2 + .../vidRequestDelete1Create1Network.json | 16 ++- .../vidRequestDelete1Create1Vnf.json | 68 +++++----- .../vidRequestDeleteMacroService.json | 139 +++++++++++++++++++++ .../vidRequestDeleteServiceWithNetwork.json | 4 +- .../vidRequestDeleteServiceWithVnf.json | 2 +- 7 files changed, 198 insertions(+), 35 deletions(-) create mode 100644 vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json (limited to 'vid-automation/src/test/resources/asyncInstantiation') diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json index ccf095294..869ff2d96 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json +++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json @@ -6,6 +6,7 @@ "modelType": "service", "modelVersion": "5.1" }, + "vidNotions":null, "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", "owningEntityName": "Lucine Sarika", "projectName": "zasaki", @@ -47,6 +48,7 @@ } }, "networks": {}, + "vrfs": {}, "vnfGroups": {}, "instanceParams": [], "pause": false, diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json index d1c40594b..d27dd05cd 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json +++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json @@ -18,6 +18,7 @@ "modelVersion": "5.1", "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705" }, + "vidNotions":null, "networks": { }, "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", @@ -35,6 +36,7 @@ "trackById": "TRACK_BY_ID", "vnfGroups": { }, + "vrfs": {}, "vnfs": { "vSAMP12 1": { "action": "Create", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json index eeda4e59a..fe4aab145 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json @@ -3,10 +3,13 @@ "isDirty":true, "vnfs":{ + }, + "vrfs":{ + }, "instanceParams":[ { - "2017488_PASQUALEvpe0_ASN":"AV_vPE" + "2017488_pasqualevpe0_ASN":"AV_vPE" } ], "validationCounter":0, @@ -20,6 +23,9 @@ }, "existingVnfGroupCounterMap":{ + }, + "existingVRFCounterMap":{ + }, "existingNetworksCounterMap":{ "94fdd893-4a36-4d70-b16a-ec29c54c184f":1 @@ -87,7 +93,7 @@ "subscriptionServiceType":"TYLER SILVIA", "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", - "lcpCloudRegionId":"JANET25", + "lcpCloudRegionId":"AAIAIC25", "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", "aicZoneId":"JAG1", "projectName":"WATKINS", @@ -104,6 +110,12 @@ "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450" }, "isALaCarte":true, + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy", + "instantiationType": "ALaCarte" + }, "name":"action-data", "version":"1.0", "description":"", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json index 3ee4a2b20..f54419169 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json @@ -6,7 +6,7 @@ "vfModules": {}, "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -25,30 +25,30 @@ }, "2017-488_PASQUALE-vPE 0": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { "instanceId": "VF_MODULE_BASE_INSTANCE_ID", "instanceName": "VFinstancenameZERO", "action": "None_Delete", "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" }, "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", "provStatus": "Prov Status", "orchStatus": "Active", "inMaint": true, - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { "instanceId": "VF_MODULE_INSTANCE_ID", "instanceName": "VFinstancename", "action": "None_Delete", @@ -56,15 +56,15 @@ "orchStatus": "Create", "provStatus": "Prov Status", "inMaint": false, - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -73,7 +73,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -95,8 +95,8 @@ }, "2017-488_PASQUALE-vPE 0:0001": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { "instanceName": "VFinstancenameZERO_001", "action": "None", "provStatus": "Prov Status", @@ -104,27 +104,27 @@ "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" }, "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { "instanceName": "VFinstancename_001", "action": "None", "volumeGroupName": "VFinstancename_vol_abc_001", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -133,7 +133,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -152,34 +152,34 @@ }, "2017-488_PASQUALE-vPE 0:0002": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { "instanceName": "VFinstancenameZERO_002", "action": "None", "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" }, "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { "instanceName": "VFinstancename_002", "action": "None", "volumeGroupName": "VFinstancename_vol_abc_002", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -188,7 +188,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -243,6 +243,7 @@ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" } }, + "vrfs": {}, "instanceParams": [], "validationCounter": 0, "existingNames": { @@ -254,6 +255,7 @@ "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 }, "existingVnfGroupCounterMap": {}, + "existingVRFCounterMap": {}, "existingNetworksCounterMap": {}, "networks": {}, "vnfGroups": {}, @@ -280,6 +282,12 @@ "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" }, "isALaCarte": true, + "vidNotions": { + "instantiationUI": "legacy", + "viewEditUI": "legacy", + "modelCategory": "other", + "instantiationType": "ALaCarte" + }, "orchStatus": "Active", "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", "testApi": "VNF_API" diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json new file mode 100644 index 000000000..64f2b161d --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json @@ -0,0 +1,139 @@ +{ + "action":"Delete", + "isDirty":true, + "vnfs":{ + + }, + "vrfs":{ + "VRF_INSTANCE_ID":{ + "action":"None_Delete", + "cloudOwner":null, + "inMaint":false, + "instanceId":"VRF_INSTANCE_ID", + "instanceName":"VRF_INSTANCE_NAME", + "instanceType":null, + "lcpCloudRegionId":"AAIAIC25", + "legacyRegion":null, + "lineOfBusiness":null, + "modelInfo":{ + "modelVersionId":"9cac02be-2489-4374-888d-2863b4511a59", + "modelInvariantId":"b67a289b-1688-496d-86e8-1583c828be0a", + "modelCustomizationId":"dd024d73-9bd1-425d-9db5-476338d53433", + "modelName":"VRF Entry Configuration", + "modelVersion":"5.0", + "modelType":"collection" + }, + "vpns":{ + "VPN_INSTANCE_ID":{ + "action":"None", + "instanceId":"VPN_INSTANCE_ID", + "trackById":"VPN_INSTANCE_ID", + "instanceName":"VPN_INSTANCE_NAME", + "instanceType":"SERVICE-INFRASTRUCTURE", + "orchStatus":"Active", + "provStatus":"prov", + "inMaint":false, + "modelInfo":{ + "modelVersionId":"vpn-model-version-id", + "modelInvariantId":"vpn-model-invariant-id", + "modelCustomizationId":"vpn-model-customization-id", + "modelName":"vf_vEPDG", + "modelVersion":"6.0", + "modelType":"vpnBinding" + }, + "routeTargets":[ + + ], + "uuid":"vpn-model-version-id" + } + }, + "networks":{ + "NETWORK_INSTANCE_ID":{ + "action":"None", + "boundToVpn":true, + "inMaint":false, + "instanceId":"NETWORK_INSTANCE_ID", + "instanceName":"NETWORK_INSTANCE_NAME", + "instanceType":"SR-IOV-PROVIDER2-2", + "modelInfo":{ + "modelVersionId":"network-instance-model-version-id", + "modelInvariantId":"network-instance-model-invariant-id", + "modelCustomizationId":"network-instance-model-customization-id", + "modelType":"network", + "modelVersion":"6.0", + "modelName":"Network Entry" + }, + "orchStatus":"Assigned", + "provStatus":"prov", + "role":"NETWORK_INSTANCE_ROLE", + "trackById":"NETWORK_INSTANCE_ID", + "uuid":"network-instance-model-version-id" + } + }, + "orchStatus":"Create", + "originalName":null, + "platformName":null, + "productFamilyId":null, + "provStatus":null, + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "trackById":"VRF_INSTANCE_ID", + "uuid":"9cac02be-2489-4374-888d-2863b4511a59" + } + }, + "instanceParams":[ + + ], + "validationCounter":0, + "existingNames":{ + "service_instance_name":"" + }, + "existingVNFCounterMap":{ + + }, + "existingVRFCounterMap":{ + "dd024d73-9bd1-425d-9db5-476338d53433":1 + }, + "existingVnfGroupCounterMap":{ + + }, + "existingNetworksCounterMap":{ + + }, + "networks":{ + + }, + "vnfGroups":{ + + }, + "bulkSize":1, + "instanceName":"InstanceName", + "globalSubscriberId":"global-customer-id", + "subscriptionServiceType":"service-instance-type", + "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId":null, + "lcpCloudRegionId":"AAIAIC25", + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId":"JAG1", + "projectName": "WATKINS", + "rollbackOnFailure":false, + "aicZoneName":"YUDFJULP-JAG1", + "cloudOwner":null, + "owningEntityName":"WayneHolland", + "tenantName":"USP-SIP-IC-24335-T-01", + "instanceId":"service-instance-id", + "modelInfo":{ + "modelInvariantId":"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId":"f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName":"Service with VRF", + "modelVersion":"5.0", + "modelType":"service" + }, + "isALaCarte":false, + "orchStatus":"GARBAGE DATA", + "vidNotions":{ + "instantiationUI":"infrastructureVpn", + "modelCategory":"other", + "viewEditUI":"infrastructureVpn", + "instantiationType":"Macro" + } +} \ No newline at end of file diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json index 171568b89..fe595360d 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json @@ -6,7 +6,7 @@ }, "instanceParams":[ { - "2017488_PASQUALEvpe0_ASN":"AV_vPE" + "2017488_pasqualevpe0_ASN":"AV_vPE" } ], "validationCounter":0, @@ -56,7 +56,7 @@ "subscriptionServiceType":"TYLER SILVIA", "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", - "lcpCloudRegionId":"JANET25", + "lcpCloudRegionId":"AAIAIC25", "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", "aicZoneId":"JAG1", "projectName":"WATKINS", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json index 695ce343b..ac5f7faf9 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json @@ -7,7 +7,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", -- cgit 1.2.3-korg