From 6d1abfb3ab6c93d67c7f92fa68cd06cb9c24d634 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 21 Jan 2020 22:10:19 +0100 Subject: [PATCH] remove workflow & algorithm from metadata --- src/ddo/MetaData.ts | 52 -------------------------- test/mocks/WebServiceConnector.mock.ts | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/src/ddo/MetaData.ts b/src/ddo/MetaData.ts index b98796e..3a9858c 100644 --- a/src/ddo/MetaData.ts +++ b/src/ddo/MetaData.ts @@ -1,51 +1,3 @@ -export interface StageRequirements { - container: { - image: string - tag: string - checksum: string - } -} - -export interface StageInput { - index: number - id: string -} - -export interface StageTransformation { - id: string -} - -export interface StageOutput { - metadataUrl: string - secretStoreUrl: string - accessProxyUrl: string - metadata: MetaDataMain -} - -export interface Stage { - index: number - stageType?: string - requirements: StageRequirements - input: StageInput - transformation: StageTransformation - output: StageOutput -} - -export interface Workflow { - stages: Stage[] -} - -export interface Algorithm { - language: string - format?: string - version?: string - entrypoint: string - requirements: { - requirement: string - version: string - } -} - export interface ServiceDefinition { auth: { type: string @@ -198,10 +150,6 @@ export interface MetaDataMain { encryptedService?: any - workflow?: Workflow - - algorithm?: Algorithm - service?: Service } diff --git a/test/mocks/WebServiceConnector.mock.ts b/test/mocks/WebServiceConnector.mock.ts index 1a7ac55..7e7dc5e 100644 --- a/test/mocks/WebServiceConnector.mock.ts +++ b/test/mocks/WebServiceConnector.mock.ts @@ -1,4 +1,4 @@ -import WebServiceConnector from '../../src/utils/WebServiceConnector' +import { WebServiceConnector } from '../../src/ocean/utils/WebServiceConnector' // @ts-ignore export default class WebServiceConnectorMock extends WebServiceConnector {