diff options
| author |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-04-09 14:17:51 -0400 |
|---|---|---|
| committer | Benjamin, Max (mb388a) <mb388a@us.att.com> | 2019-04-10 11:45:31 -0400 |
| commit | 7476b99cbff0989b1187364dff65ef37bb57510e (patch) | |
| tree | a817494c507e2706e5e819f0f0a8a876287b1136 /adapters/mso-openstack-adapters/src/main/java/org | |
| parent | c6d3ec1230b2d68548587b28d4a9b02e9e96101f (diff) | |
Re-commit some changes which were lost
remove unused code
Issue-ID: SO-1767
Change-Id: I12b8295ae4a5bc9e9154c8ccd1bb53f70886f929
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'adapters/mso-openstack-adapters/src/main/java/org')
2 files changed, 1 insertions, 16 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImpl.java index d13b1724df..4753b1c18d 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImpl.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterAsyncImpl.java @@ -67,7 +67,7 @@ public class MsoNetworkAdapterAsyncImpl implements MsoNetworkAdapterAsync { private static final Logger logger = LoggerFactory.getLogger(MsoNetworkAdapterAsyncImpl.class); private static final String BPEL_AUTH_PROP = "org.onap.so.adapters.network.bpelauth"; - private static final String ENCRYPTION_KEY_PROP = "org.onap.so.adapters.network.encryptionKey"; + private static final String ENCRYPTION_KEY_PROP = "mso.msoKey"; private static final String NETWORK_EXCEPTION_MSG = "Got a NetworkException on createNetwork: "; private static final String CREATE_NETWORK_ERROR_LOGMSG = "{} {} Error sending createNetwork notification {} "; private static final String FAULT_INFO_ERROR_LOGMSG = "{} {} Exception - fault info "; diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRest.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRest.java index 487b14b942..e81b211b27 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRest.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/VnfAdapterRest.java @@ -359,22 +359,7 @@ public class VnfAdapterRest { vfModuleStackId.value = "479D3D8B-6360-47BC-AB75-21CC91981484"; outputs.value = VolumeAdapterRest.testMap(); } else { - // vnfAdapter.createVnf (createReq.getCloudSiteId(), - // createReq.getTenantId(), - // createReq.getVnfType(), - // createReq.getVnfVersion(), - // createReq.getVfModuleName(), - // createReq.getRequestType(), - // createReq.getVolumeGroupStackId(), - // createReq.getVfModuleParams(), - // createReq.getFailIfExists(), - // createReq.getBackout(), - // createReq.getMsoRequest(), - // vfModuleStackId, - // outputs, - // vnfRollback); vnfAdapter.createVfModule(req.getCloudSiteId(), req.getCloudOwner(), req.getTenantId(), - // req.getVnfType(), completeVnfVfModuleType, req.getVnfVersion(), req.getVnfId(), req.getVfModuleName(), req.getVfModuleId(), req.getRequestType(), req.getVolumeGroupStackId(), req.getBaseVfModuleStackId(), req.getModelCustomizationUuid(), req.getVfModuleParams(), |