Commit dfbdf668 authored by Vasilis Katopodis's avatar Vasilis Katopodis
Browse files

Merge branch 'feat/ocm-hypo-scheduler' into 'develop'

feat: OCM test uses the HypO scheduler installed on the hub

See merge request !18
parents 88d01d31 486e21be
Loading
Loading
Loading
Loading
Loading
+32
Changes for src/test/resources/hypo/ocm-scheduling-manifest.js: 32 added lines, 0 removed lines.
Original line number Diff line number Diff line
// Builds the base64 "Cluster Metadata" (HypoSchedulingManifest header) for the OCM scenario.
// Env file keys (defaults = ETSI hub): ocm-cluster-set, ocm-location-a (mariadb on create), ocm-location-b (the rest, and mariadb on update)
function(phase) {
  var clusterSet = karate.get('ocm-cluster-set', 'hypo-cicd');
  var locationA = karate.get('ocm-location-a', 'etsi-hypo-2');
  var locationB = karate.get('ocm-location-b', 'etsi-hypo-3');
  var mariadbLocation = phase == 'update' ? locationB : locationA;

  var manifest =
      'apiVersion: scheduling.hypo.eu/v1alpha1\n'
    + 'kind: HypoSchedulingManifest\n'
    + 'metadata:\n'
    + '  name: scheduling-scenario\n'
    + '  namespace: hypo-scheduler-system\n'
    + 'spec:\n'
    + '  globalAnnotations:\n'
    + '    - "hypo.target.managedClusterSet=' + clusterSet + '"\n'
    + '  workloadAnnotations:\n'
    + '    - name: mariadb\n'
    + '      annotations:\n'
    + '      - hypo.filter.location=' + mariadbLocation + '\n'
    + '    - name: phpmyadmin\n'
    + '      annotations:\n'
    + '      - hypo.filter.location=' + locationB + '\n'
    + '    - name: wordpress\n'
    + '      annotations:\n'
    + '      - hypo.filter.location=' + locationB + '\n';

  karate.log('OCM scheduling manifest (' + phase + '):\n' + manifest);
  var Base64 = Java.type('java.util.Base64');
  return Base64.getEncoder().encodeToString(new java.lang.String(manifest).getBytes('UTF-8'));
}
+2 −1
Changes for src/test/resources/hypo/service.feature: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ Scenario: Create Service Order
      """
  
  # Load the correct file (replace 'envType' with your actual variable name)
  * def clusterMetadata = clusterType.contains('ocm') ? read('classpath:hypo/ocm-scheduling-manifest.js')('create') : null
  * def payload_k8s = choosePayload(clusterType)

  # Request
@@ -517,7 +518,7 @@ Scenario: Update the Service Cluster Metadatevia PATCH

  
  # 2. Define the new Helm configuration string
   * def newClusterMetadata = infra == 'ubi' ? 'YXBpVmVyc2lvbjogc2NoZWR1bGluZy5wMmNvZGUuZXUvdjFhbHBoYTEKa2luZDogUDJDb2RlU2NoZWR1bGluZ01hbmlmZXN0Cm1ldGFkYXRhOgogIG5hbWU6IHBvYwogIG5hbWVzcGFjZTogcDJjb2RlLXNjaGVkdWxlci1zeXN0ZW0KICBsYWJlbHM6CiAgICBhcHAua3ViZXJuZXRlcy5pby9uYW1lOiBwMmNvZGUtc2NoZWR1bGVyCiAgICBhcHAua3ViZXJuZXRlcy5pby9tYW5hZ2VkLWJ5OiBrdXN0b21pemUKc3BlYzoKICBnbG9iYWxBbm5vdGF0aW9uczoKICAgIC0gInAyY29kZS50YXJnZXQubWFuYWdlZENsdXN0ZXJTZXQ9ZGVmYXVsdCIKICB3b3JrbG9hZEFubm90YXRpb25zOgogICAgLSBuYW1lOiBtYXJpYWRiCiAgICAgIGFubm90YXRpb25zOgogICAgICAgIC0gcDJjb2RlLmZpbHRlci5sb2NhdGlvbj1hdGhlbnMKICAgIC0gbmFtZTogcGhwbXlhZG1pbgogICAgICBhbm5vdGF0aW9uczoKICAgICAgICAtIHAyY29kZS5maWx0ZXIubG9jYXRpb249YXRoZW5zCiAgICAtIG5hbWU6IHdvcmRwcmVzcwogICAgICBhbm5vdGF0aW9uczoKICAgICAgICAtIHAyY29kZS5maWx0ZXIubG9jYXRpb249YXRoZW5z' : 'YXBpVmVyc2lvbjogc2NoZWR1bGluZy5wMmNvZGUuZXUvdjFhbHBoYTEKa2luZDogUDJDb2RlU2NoZWR1bGluZ01hbmlmZXN0Cm1ldGFkYXRhOgogIGxhYmVsczoKICAgIGFwcC5rdWJlcm5ldGVzLmlvL25hbWU6IHAyY29kZS1zY2hlZHVsZXIKICAgIGFwcC5rdWJlcm5ldGVzLmlvL21hbmFnZWQtYnk6IGt1c3RvbWl6ZQogIG5hbWU6IHNjaGVkdWxpbmctc2NlbmFyaW8KICBuYW1lc3BhY2U6IHAyY29kZS1zY2hlZHVsZXItc3lzdGVtCnNwZWM6CiAgZ2xvYmFsQW5ub3RhdGlvbnM6CiAgICAtICJwMmNvZGUudGFyZ2V0Lm1hbmFnZWRDbHVzdGVyU2V0PWh5cG8tY2ljZCIKICB3b3JrbG9hZEFubm90YXRpb25zOgogICAgLSBuYW1lOiBtYXJpYWRiCiAgICAgIGFubm90YXRpb25zOgogICAgICAtIHAyY29kZS5maWx0ZXIubG9jYXRpb249ZXRzaS1oeXBvLTMKICAgIC0gbmFtZTogcGhwbXlhZG1pbgogICAgICBhbm5vdGF0aW9uczoKICAgICAgLSBwMmNvZGUuZmlsdGVyLmxvY2F0aW9uPWV0c2ktaHlwby0zCiAgICAtIG5hbWU6IHdvcmRwcmVzcwogICAgICBhbm5vdGF0aW9uczoKICAgICAgLSBwMmNvZGUuZmlsdGVyLmxvY2F0aW9uPWV0c2ktaHlwby0z'
   * def newClusterMetadata = read('classpath:hypo/ocm-scheduling-manifest.js')('update')


   * eval updatedPayload.serviceCharacteristic[characteristicIndex].value.value = newClusterMetadata
−21

File deleted.

−21

File deleted.

+1 −1
Changes for src/test/resources/payloads/services/service-order-end-user-preOCM.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@
            "name": "Cluster Metadata",
            "valueType": "TEXT",
            "value": {
              "value": "YXBpVmVyc2lvbjogc2NoZWR1bGluZy5wMmNvZGUuZXUvdjFhbHBoYTEKa2luZDogUDJDb2RlU2NoZWR1bGluZ01hbmlmZXN0Cm1ldGFkYXRhOgogIGxhYmVsczoKICAgIGFwcC5rdWJlcm5ldGVzLmlvL25hbWU6IHAyY29kZS1zY2hlZHVsZXIKICAgIGFwcC5rdWJlcm5ldGVzLmlvL21hbmFnZWQtYnk6IGt1c3RvbWl6ZQogIG5hbWU6IHNjaGVkdWxpbmctc2NlbmFyaW8KICBuYW1lc3BhY2U6IHAyY29kZS1zY2hlZHVsZXItc3lzdGVtCnNwZWM6CiAgZ2xvYmFsQW5ub3RhdGlvbnM6CiAgICAtICJwMmNvZGUudGFyZ2V0Lm1hbmFnZWRDbHVzdGVyU2V0PWh5cG8tY2ljZCIKICB3b3JrbG9hZEFubm90YXRpb25zOgogICAgLSBuYW1lOiBtYXJpYWRiCiAgICAgIGFubm90YXRpb25zOgogICAgICAtIHAyY29kZS5maWx0ZXIubG9jYXRpb249ZXRzaS1oeXBvLTIKICAgIC0gbmFtZTogcGhwbXlhZG1pbgogICAgICBhbm5vdGF0aW9uczoKICAgICAgLSBwMmNvZGUuZmlsdGVyLmxvY2F0aW9uPWV0c2ktaHlwby0zCiAgICAtIG5hbWU6IHdvcmRwcmVzcwogICAgICBhbm5vdGF0aW9uczoKICAgICAgLSBwMmNvZGUuZmlsdGVyLmxvY2F0aW9uPWV0c2ktaHlwby0z",
              "value": "#(clusterMetadata)",
              "alias": null
            }
          }