Commit 691ad541 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

added gpu configuration in cypress test

parent 5351a1d4

js-apps/meep-frontend/src/js/containers/cfg/cfg-network-element-container.js

+4 −4
Original line number Diff line number Diff line
@@ -657,10 +657,6 @@ const TypeRelatedFormFields = ({onUpdate, element}) => { 
                          onUpdate={onUpdate}

                          element={element}

                        />

                        <GpuGroup

                          onUpdate={onUpdate}

                          element={element}

                        />

                        <CfgTextField

                          onUpdate={onUpdate}

                          element={element}
@@ -669,6 +665,10 @@ const TypeRelatedFormFields = ({onUpdate, element}) => { 
                          fieldName={FIELD_GROUP}

                          cydata={CFG_ELEM_GROUP}

                        />

                        <GpuGroup

                          onUpdate={onUpdate}

                          element={element}

                        />

                        <CfgTextField

                          onUpdate={onUpdate}

                          element={element}

test/cypress/integration/tests/scenario-cfg-spec.js

+26 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ import { 
  FIELD_PROTOCOL,

  FIELD_GROUP,

  FIELD_SVC_MAP,

  FIELD_GPU_COUNT,

  FIELD_GPU_TYPE,

  FIELD_ENV_VAR,

  FIELD_CMD,

  FIELD_CMD_ARGS,
@@ -401,6 +403,8 @@ describe('Scenario Configuration', function() { 
  let edgeAppExtPort = '32323';

  let edgeAppProt = 'TCP';

  let edgeAppGroup = 'edge-svc';

  let edgeAppGpuCount = '1';

  let edgeAppGpuType = 'NVIDIA';

  let edgeAppEnv = 'ENV_VAR=my-env-var';

  let edgeAppCmd = '/bin/bash';

  let edgeAppArgs = '-c, export;';
@@ -415,6 +419,8 @@ describe('Scenario Configuration', function() { 
    type(meep.CFG_ELEM_EXT_PORT, edgeAppExtPort);

    select(meep.CFG_ELEM_PROT, edgeAppProt);

    type(meep.CFG_ELEM_GROUP, edgeAppGroup);

    type(meep.CFG_ELEM_GPU_COUNT, edgeAppGpuCount);

    select(meep.CFG_ELEM_GPU_TYPE, edgeAppGpuType);

    type(meep.CFG_ELEM_ENV, edgeAppEnv);

    type(meep.CFG_ELEM_CMD, edgeAppCmd);

    type(meep.CFG_ELEM_ARGS, edgeAppArgs);
@@ -434,6 +440,8 @@ describe('Scenario Configuration', function() { 
      assert.equal(getElemFieldVal(entry, FIELD_EXT_PORT), edgeAppExtPort);

      assert.equal(getElemFieldVal(entry, FIELD_PROTOCOL), edgeAppProt);

      assert.equal(getElemFieldVal(entry, FIELD_GROUP), edgeAppGroup);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_COUNT), edgeAppGpuCount);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_TYPE), edgeAppGpuType);

      assert.equal(getElemFieldVal(entry, FIELD_ENV_VAR), edgeAppEnv);

      assert.equal(getElemFieldVal(entry, FIELD_CMD), edgeAppCmd);

      assert.equal(getElemFieldVal(entry, FIELD_CMD_ARGS), edgeAppArgs);
@@ -512,6 +520,8 @@ describe('Scenario Configuration', function() { 
  let fogAppExtPort = '31313';

  let fogAppProt = 'UDP';

  let fogAppGroup = 'fog-svc';

  let fogAppGpuCount = '2';

  let fogAppGpuType = 'NVIDIA';

  let fogAppEnv = 'ENV_VAR=my-env-var';

  let fogAppCmd = '/bin/bash';

  let fogAppArgs = '-c, export;';
@@ -526,6 +536,8 @@ describe('Scenario Configuration', function() { 
    type(meep.CFG_ELEM_EXT_PORT, fogAppExtPort);

    select(meep.CFG_ELEM_PROT, fogAppProt);

    type(meep.CFG_ELEM_GROUP, fogAppGroup);

    type(meep.CFG_ELEM_GPU_COUNT, fogAppGpuCount);

    select(meep.CFG_ELEM_GPU_TYPE, fogAppGpuType);

    type(meep.CFG_ELEM_ENV, fogAppEnv);

    type(meep.CFG_ELEM_CMD, fogAppCmd);

    type(meep.CFG_ELEM_ARGS, fogAppArgs);
@@ -545,6 +557,8 @@ describe('Scenario Configuration', function() { 
      assert.equal(getElemFieldVal(entry, FIELD_EXT_PORT), fogAppExtPort);

      assert.equal(getElemFieldVal(entry, FIELD_PROTOCOL), fogAppProt);

      assert.equal(getElemFieldVal(entry, FIELD_GROUP), fogAppGroup);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_COUNT), fogAppGpuCount);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_TYPE), fogAppGpuType);

      assert.equal(getElemFieldVal(entry, FIELD_ENV_VAR), fogAppEnv);

      assert.equal(getElemFieldVal(entry, FIELD_CMD), fogAppCmd);

      assert.equal(getElemFieldVal(entry, FIELD_CMD_ARGS), fogAppArgs);
@@ -579,6 +593,8 @@ describe('Scenario Configuration', function() { 
  // ==============================



  let ueAppImg = 'nginx';

  let ueAppGpuCount = '3';

  let ueAppGpuType = 'NVIDIA';

  let ueAppEnv = 'ENV_VAR=my-env-var';

  let ueAppCmd = '/bin/bash';

  let ueAppArgs = '-c, export;';
@@ -590,6 +606,8 @@ describe('Scenario Configuration', function() { 
    select(meep.CFG_ELEM_PARENT, parent);

    type(meep.CFG_ELEM_NAME, name);

    type(meep.CFG_ELEM_IMG, ueAppImg);

    type(meep.CFG_ELEM_GPU_COUNT, ueAppGpuCount);

    select(meep.CFG_ELEM_GPU_TYPE, ueAppGpuType);

    type(meep.CFG_ELEM_ENV, ueAppEnv);

    type(meep.CFG_ELEM_CMD, ueAppCmd);

    type(meep.CFG_ELEM_ARGS, ueAppArgs);
@@ -605,6 +623,8 @@ describe('Scenario Configuration', function() { 
      assert.equal(getElemFieldVal(entry, FIELD_TYPE), meep.ELEMENT_TYPE_UE_APP);

      assert.equal(getElemFieldVal(entry, FIELD_PARENT), parent);

      assert.equal(getElemFieldVal(entry, FIELD_IMAGE), ueAppImg);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_COUNT), ueAppGpuCount);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_TYPE), ueAppGpuType);

      assert.equal(getElemFieldVal(entry, FIELD_ENV_VAR), ueAppEnv);

      assert.equal(getElemFieldVal(entry, FIELD_CMD), ueAppCmd);

      assert.equal(getElemFieldVal(entry, FIELD_CMD_ARGS), ueAppArgs);
@@ -663,6 +683,8 @@ describe('Scenario Configuration', function() { 
  let cloudAppPort = '9101';

  let cloudAppExtPort = '30303';

  let cloudAppProt = 'TCP';

  let cloudAppGpuCount = '4';

  let cloudAppGpuType = 'NVIDIA';

  let cloudAppEnv = 'ENV_VAR=my-env-var';

  let cloudAppCmd = '/bin/bash';

  let cloudAppArgs = '-c, export;';
@@ -676,6 +698,8 @@ describe('Scenario Configuration', function() { 
    type(meep.CFG_ELEM_PORT, cloudAppPort);

    type(meep.CFG_ELEM_EXT_PORT, cloudAppExtPort);

    select(meep.CFG_ELEM_PROT, cloudAppProt);

    type(meep.CFG_ELEM_GPU_COUNT, cloudAppGpuCount);

    select(meep.CFG_ELEM_GPU_TYPE, cloudAppGpuType);

    type(meep.CFG_ELEM_ENV, cloudAppEnv);

    type(meep.CFG_ELEM_CMD, cloudAppCmd);

    type(meep.CFG_ELEM_ARGS, cloudAppArgs);
@@ -694,6 +718,8 @@ describe('Scenario Configuration', function() { 
      assert.equal(getElemFieldVal(entry, FIELD_PORT), cloudAppPort);

      assert.equal(getElemFieldVal(entry, FIELD_EXT_PORT), cloudAppExtPort);

      assert.equal(getElemFieldVal(entry, FIELD_PROTOCOL), cloudAppProt);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_COUNT), cloudAppGpuCount);

      assert.equal(getElemFieldVal(entry, FIELD_GPU_TYPE), cloudAppGpuType);

      assert.equal(getElemFieldVal(entry, FIELD_ENV_VAR), cloudAppEnv);

      assert.equal(getElemFieldVal(entry, FIELD_CMD), cloudAppCmd);

      assert.equal(getElemFieldVal(entry, FIELD_CMD_ARGS), cloudAppArgs);