Third part of onap rename

This part of the commit changes the folder structure on all other
folders of appc.

Change-Id: I8acfa11cdfcdcd36be0e137245d1dd7324f1abd3
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-13

11 files changed, 0 insertions, 792 deletions

diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java
deleted file mode 100644
index bb5b4cdab..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionIdentifiers.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-
-public class ActionIdentifiers {
-    private String serviceInstanceId;
-    private String vnfId;
-    private String vnfcName;
-    private String vfModuleId;
-    private String vServerId;
-
-    public String getServiceInstanceId() {
-        return serviceInstanceId;
-    }
-
-    public void setServiceInstanceId(String serviceInstanceId) {
-        this.serviceInstanceId = serviceInstanceId;
-    }
-
-    public String getVnfId() {
-        return vnfId;
-    }
-
-    public void setVnfId(String vnfId) {
-        this.vnfId = vnfId;
-    }
-
-    public String getVnfcName() {
-        return vnfcName;
-    }
-
-    public void setVnfcName(String vnfcName) {
-        this.vnfcName = vnfcName;
-    }
-
-    public String getVserverId() {
-        return vServerId;
-    }
-
-    public void setvServerId(String vServerId) {
-        this.vServerId = vServerId;
-    }
-
-    public String getVfModuleId() {
-        return vfModuleId;
-    }
-
-    public void setVfModuleId(String vfModuleId) {
-        this.vfModuleId = vfModuleId;
-    }
-
-    @Override
-    public String toString() {
-        return "ActionIdentifiers{" +
-                "serviceInstanceId='" + serviceInstanceId + '\'' +
-                ", vnfId='" + vnfId + '\'' +
-                ", vfModuleId ='" + vfModuleId + '\'' +
-                ", vnfcName='" + vnfcName + '\'' +
-                ", vServerId='" + vServerId + '\'' +
-                '}';
-    }
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java
deleted file mode 100644
index 230812cef..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ActionLevel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-public enum ActionLevel {
-    VNF,VM,VNFC
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
deleted file mode 100644
index 7c44efecb..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-import java.time.Instant;
-
-
-public class CommonHeader {
-
-    private Flags flags;
-    private Instant timestamp;
-    private String apiVer;
-    private String originatorId;
-    private String requestId;
-    private String subRequestId;
-
-    public Flags getFlags() {
-        return flags;
-    }
-
-    public void setFlags(Flags flags) {
-        this.flags = flags;
-    }
-
-    public Instant getTimeStamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Instant timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public String getApiVer() {
-        return apiVer;
-    }
-
-    public void setApiVer(String apiVer) {
-        this.apiVer = apiVer;
-    }
-
-    public String getOriginatorId() {
-        return originatorId;
-    }
-
-    public void setOriginatorId(String originatorId) {
-        this.originatorId = originatorId;
-    }
-
-    public String getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(String requestId) {
-        this.requestId = requestId;
-    }
-
-    public String getSubRequestId() {
-        return subRequestId;
-    }
-
-    public void setSubRequestId(String subRequestId) {
-        this.subRequestId = subRequestId;
-    }
-
-    @Override
-    public String toString() {
-        return "CommonHeader{" +
-                "flags=" + flags +
-                ", timestamp=" + timestamp +
-                ", apiVer='" + apiVer + '\'' +
-                ", originatorId='" + originatorId + '\'' +
-                ", requestId='" + requestId + '\'' +
-                ", subRequestId='" + subRequestId + '\'' +
-                '}';
-    }
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java
deleted file mode 100644
index 4102955f0..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Flags.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-
-public class Flags {
-
-    private final boolean force;
-    private final int ttl;
-    private final Mode mode;
-
-    public Flags(Mode mode, boolean force, int ttl) {
-        super();
-        this.force = force;
-        this.ttl = ttl;
-        this.mode = mode;
-    }
-
-    public boolean isForce() {
-        return force;
-    }
-
-    public int getTtl() {
-        return ttl;
-    }
-
-    public Mode getMode() {
-        return mode;
-    }
-
-    @Override
-    public String toString() {
-        return "Flags{" +
-                "force=" + force +
-                ", ttl=" + ttl +
-                ", mode=" + mode +
-                '}';
-    }
-
-    public enum Mode {
-        EXCLUSIVE,
-        NORMAL
-    }
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java
deleted file mode 100644
index b5b017e40..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/OperationType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
-        * ============LICENSE_START=======================================================
-        * ONAP : APPC
-        * ================================================================================
-        * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-        * ================================================================================
-        * Copyright (C) 2017 Amdocs
-        * =============================================================================
-        * Licensed under the Apache License, Version 2.0 (the "License");
-        * you may not use this file except in compliance with the License.
-        * You may obtain a copy of the License at
-        *
-        *      http://www.apache.org/licenses/LICENSE-2.0
-        *
-        * Unless required by applicable law or agreed to in writing, software
-        * distributed under the License is distributed on an "AS IS" BASIS,
-        * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        * See the License for the specific language governing permissions and
-        * limitations under the License.
-        *
-        * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-        * ============LICENSE_END=========================================================
-        */
-
-package org.onap.appc.domainmodel.lcm;
-
-public enum OperationType {
-    ReadOnly,BuiltIn,OrchestrationStatusUpdate,OperationStatusUpdate
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java
deleted file mode 100644
index 12ad5ae95..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RequestContext.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class RequestContext {
-
-    private CommonHeader commonHeader;
-    private ActionIdentifiers actionIdentifiers;
-    private VNFOperation action;
-    private ActionLevel actionLevel;
-    private String payload;
-    private Map<String, String> additionalContext;
-
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    public ActionIdentifiers getActionIdentifiers() {
-        return actionIdentifiers;
-    }
-
-    public void setActionIdentifiers(ActionIdentifiers actionIdentifiers) {
-        this.actionIdentifiers = actionIdentifiers;
-    }
-
-    public VNFOperation getAction() {
-        return action;
-    }
-
-    public void setAction(VNFOperation action) {
-        this.action = action;
-    }
-
-    public String getPayload() {
-        return payload;
-    }
-
-    public void setPayload(String payload) {
-        this.payload = payload;
-    }
-
-    public Map<String, String> getAdditionalContext() {
-        return additionalContext;
-    }
-
-    public void setAdditionalContext(Map<String, String> additionalContext) {
-        this.additionalContext = additionalContext;
-    }
-
-    public void addKeyValueToAdditionalContext(String key, String value ){
-        if (this.additionalContext == null) {
-            this.additionalContext = new HashMap<>();
-        }
-        this.additionalContext.put(key, value);
-    }
-
-    public ActionLevel getActionLevel() {
-        return actionLevel;
-    }
-
-    public void setActionLevel(ActionLevel actionLevel) {
-        this.actionLevel = actionLevel;
-    }
-
-    @Override
-    public String toString() {
-        return "RequestContext{" +
-                "commonHeader=" + commonHeader +
-                ", actionIdentifiers=" + actionIdentifiers +
-                ", action=" + action +
-                ", actionLevel = " + actionLevel +
-                ", payload='" + payload + '\'' +
-                ", additionalContext=" + additionalContext +
-                '}';
-    }
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java
deleted file mode 100644
index da3a6be69..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/ResponseContext.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class ResponseContext {
-    private CommonHeader commonHeader;
-    private Status status;
-    private String payload;
-    private Map<String, String> additionalContext;
-
-    public CommonHeader getCommonHeader() {
-        return commonHeader;
-    }
-
-    public void setCommonHeader(CommonHeader commonHeader) {
-        this.commonHeader = commonHeader;
-    }
-
-    public Status getStatus() {
-        return status;
-    }
-
-    public void setStatus(Status status) {
-        this.status = status;
-    }
-
-    public String getPayload() {
-        return payload;
-    }
-
-    public void setPayload(String payload) {
-        this.payload = payload;
-    }
-
-    public Map<String, String> getAdditionalContext() {
-        return additionalContext;
-    }
-
-    public void setAdditionalContext(Map<String, String> additionalContext) {
-        this.additionalContext = additionalContext;
-    }
-
-    public void addKeyValueToAdditionalContext(String key, String value ){
-        if (this.additionalContext == null) {
-            this.additionalContext = new HashMap<>();
-        }
-        this.additionalContext.put(key, value);
-    }
-
-    @Override
-    public String toString() {
-        return "ResponseContext{" +
-                "commonHeader=" + commonHeader +
-                ", status=" + status +
-                ", payload='" + payload + '\'' +
-                ", additionalContext=" + additionalContext +
-                '}';
-    }
-
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
deleted file mode 100644
index 2580f1830..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-import java.time.Instant;
-import java.util.Date;
-
-
-public class RuntimeContext {
-
-    private RequestContext requestContext;
-    private ResponseContext responseContext;
-    private VNFContext vnfContext;
-
-    //TODO move fields timeStart abd isLockAcquired to a better place
-    private Instant timeStart;
-    private boolean isLockAcquired;
-    private String rpcName;
-
-    public String getRpcName() {
-        return rpcName;
-    }
-
-    public void setRpcName(String rpcName) {
-        this.rpcName = rpcName;
-    }
-
-    public Instant getTimeStart() {
-        return timeStart;
-    }
-
-    public boolean isLockAcquired() {
-        return isLockAcquired;
-    }
-
-    public void setIsLockAcquired(boolean isLockAcquired) {
-        this.isLockAcquired = isLockAcquired;
-    }
-
-    public void setTimeStart(Instant timeStart) {
-        this.timeStart = timeStart;
-    }
-
-    public RequestContext getRequestContext() {
-        return requestContext;
-    }
-
-    public void setRequestContext(RequestContext requestContext) {
-        this.requestContext = requestContext;
-    }
-
-    public ResponseContext getResponseContext() {
-        return responseContext;
-    }
-
-    public void setResponseContext(ResponseContext responseContext) {
-        this.responseContext = responseContext;
-    }
-
-    public VNFContext getVnfContext() {
-        return vnfContext;
-    }
-
-    public void setVnfContext(VNFContext vnfContext) {
-        this.vnfContext = vnfContext;
-    }
-
-    @Override
-    public String toString() {
-        return "RuntimeContext{" +
-                "requestContext=" + requestContext +
-                ", responseContext=" + responseContext +
-                ", vnfContext=" + vnfContext +
-                ", timeStart=" + timeStart +
-                ", isLockAcquired=" + isLockAcquired +
-                ", rpcName='" + rpcName + '\'' +
-                '}';
-    }
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java
deleted file mode 100644
index 2f8fd1950..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/Status.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-
-public class Status {
-
-    private final int code;
-    private final String message;
-
-    public Status(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    @Override
-    public String toString() {
-        return "Status{" +
-                "code='" + code + '\'' +
-                ", message='" + message + '\'' +
-                '}';
-    }
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java
deleted file mode 100644
index bcc31fcec..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFContext.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-
-public class VNFContext {
-    private String id;
-    private String type;
-    private String version;
-    private String status;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-
-    @Override
-    public String toString() {
-        return "VNFContext{" +
-                "id='" + id + '\'' +
-                ", type='" + type + '\'' +
-                ", version='" + version + '\'' +
-                ", status='" + status + '\'' +
-                '}';
-    }
-}
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java
deleted file mode 100644
index 228005d34..000000000
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/VNFOperation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.appc.domainmodel.lcm;
-
-public enum VNFOperation {
-    Configure, Test, HealthCheck, Start, Terminate, Restart, Rebuild, Stop, ConfigModify,
-    ConfigScaleOut,ConfigRestore,Backup, Snapshot,
-    SoftwareUpload, LiveUpgrade, Rollback, Test_lic, Migrate, Evacuate,StopApplication, StartApplication,
-    Sync(OperationType.ReadOnly), Audit(OperationType.ReadOnly),
-    ConfigBackup(OperationType.ReadOnly),ConfigBackupDelete(OperationType.ReadOnly),ConfigExport(OperationType.ReadOnly),
-    Lock(OperationType.BuiltIn), Unlock(OperationType.BuiltIn), CheckLock(OperationType.BuiltIn);
-
-    private OperationType operationType;
-
-    VNFOperation(OperationType operationType){
-        this.operationType=operationType;
-    }
-
-    VNFOperation() {
-        this.operationType=OperationType.OrchestrationStatusUpdate;
-    }
-    /**
-     * Operations handled directly by the RequestHandler without further call to DG are built-in operations.
-     */
-    public boolean isBuiltIn() {
-        return this.operationType.equals(OperationType.BuiltIn);
-    }
-
-    public OperationType getOperationType() {
-        return operationType;
-    }
-
-    public static VNFOperation findByString(String operationName) {
-        for(VNFOperation operation: VNFOperation.values()) {
-            if(operation.name().equals(operationName)) {
-                return operation;
-            }
-        }
-        return null;
-    }
-}