aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java16
-rw-r--r--asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java4
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java4
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetMetadataConverter.java2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadata.java10
5 files changed, 18 insertions, 18 deletions
diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java
index 6a69120a05..9172b8a632 100644
--- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java
+++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java
@@ -28,7 +28,7 @@ public class ResourceInstanceAssetStructure {
String resourceName;
String resourceInvariantUUID;
String resourceVersion;
- String resoucreType;
+ String resourceType;
String resourceUUID;
List<ArtifactAssetStructure> artifacts;
@@ -37,14 +37,14 @@ public class ResourceInstanceAssetStructure {
}
public ResourceInstanceAssetStructure(String resourceInstanceName, String resourceName,
- String resourceInvariantUUID, String resourceVersion, String resoucreType, String resourceUUID,
+ String resourceInvariantUUID, String resourceVersion, String resourceType, String resourceUUID,
List<ArtifactAssetStructure> artifacts) {
super();
this.resourceInstanceName = resourceInstanceName;
this.resourceName = resourceName;
this.resourceInvariantUUID = resourceInvariantUUID;
this.resourceVersion = resourceVersion;
- this.resoucreType = resoucreType;
+ this.resourceType = resourceType;
this.resourceUUID = resourceUUID;
this.artifacts = artifacts;
}
@@ -81,12 +81,12 @@ public class ResourceInstanceAssetStructure {
this.resourceVersion = resourceVersion;
}
- public String getResoucreType() {
- return resoucreType;
+ public String getResourceType() {
+ return resourceType;
}
- public void setResoucreType(String resoucreType) {
- this.resoucreType = resoucreType;
+ public void setResourceType(String resourceType) {
+ this.resourceType = resourceType;
}
public String getResourceUUID() {
@@ -109,7 +109,7 @@ public class ResourceInstanceAssetStructure {
public String toString() {
return "ResourceInstanceAssetStructure [resourceInstanceName=" + resourceInstanceName + ", resourceName="
+ resourceName + ", resourceInvariantUUID=" + resourceInvariantUUID + ", resourceVersion="
- + resourceVersion + ", resoucreType=" + resoucreType + ", resourceUUID=" + resourceUUID + ", artifacts="
+ + resourceVersion + ", resourceType=" + resourceType + ", resourceUUID=" + resourceUUID + ", artifacts="
+ artifacts + "]";
}
diff --git a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java
index 51bd2162c0..39001403b9 100644
--- a/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java
+++ b/asdc-tests/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/AssetRestUtils.java
@@ -395,9 +395,9 @@ public class AssetRestUtils extends BaseRestUtils {
.equals(resourceInstanceAssetStructure.getResourceVersion()));
assertTrue(
"Expected RI asset resourceType is " + componentInstance.getOriginType() + " actual: "
- + resourceInstanceAssetStructure.getResoucreType(),
+ + resourceInstanceAssetStructure.getResourceType(),
componentInstance.getOriginType().toString()
- .equals(resourceInstanceAssetStructure.getResoucreType()));
+ .equals(resourceInstanceAssetStructure.getResourceType()));
assertTrue(
"Expected RI asset resourceUUID is " + componentInstance.getComponentUid() + " actual: "
+ resourceInstanceAssetStructure.getResourceUUID(),
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java
index da148ee80a..6e67e38c15 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java
@@ -147,7 +147,7 @@ public class ServiceDistributionArtifactsBuilder {
List<JsonContainerResourceInstance> ret = new ArrayList<JsonContainerResourceInstance>();
if (service.getComponentInstances() != null) {
for (ComponentInstance resourceInstance : service.getComponentInstances()) {
- String resoucreType = "VF";
+ String resourceType = "VF";
List<ArtifactDefinition> artifactsDefList = getArtifactsWithPayload(resourceInstance);
List<ArtifactInfoImpl> artifacts = ArtifactInfoImpl.convertToArtifactInfoImpl(service, resourceInstance, artifactsDefList);
Either<String, StorageOperationStatus> responseResult = resourceOperation.getInvariantUUID(NodeTypeEnum.Resource, resourceInstance.getComponentUid(), false);
@@ -157,7 +157,7 @@ public class ServiceDistributionArtifactsBuilder {
} else {
resourceInvariantUUID = responseResult.left().value();
}
- JsonContainerResourceInstance jsonContainer = new JsonContainerResourceInstance(resourceInstance, resourceInvariantUUID, resoucreType, artifacts);
+ JsonContainerResourceInstance jsonContainer = new JsonContainerResourceInstance(resourceInstance, resourceInvariantUUID, resourceType, artifacts);
ret.add(jsonContainer);
}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetMetadataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetMetadataConverter.java
index 20eac081c9..662399142e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetMetadataConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetMetadataConverter.java
@@ -345,7 +345,7 @@ public class AssetMetadataConverter {
metadata.setResourceInstanceName(componentInstance.getName());
metadata.setResourceName(componentInstance.getComponentName());
metadata.setResourceVersion(componentInstance.getComponentVersion());
- metadata.setResoucreType(componentInstance.getOriginType().getValue());
+ metadata.setResourceType(componentInstance.getOriginType().getValue());
metadata.setResourceUUID(componentInstance.getComponentUid());
Collection<ArtifactDefinition> values = componentInstance.getDeploymentArtifacts().values();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadata.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadata.java
index a53422f311..547bb301f8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadata.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/representation/ResourceInstanceMetadata.java
@@ -27,7 +27,7 @@ public class ResourceInstanceMetadata {
private String resourceName;
private String resourceInvariantUUID;
private String resourceVersion;
- private String resoucreType;
+ private String resourceType;
private String resourceUUID;
private List<ArtifactMetadata> artifacts;
@@ -63,12 +63,12 @@ public class ResourceInstanceMetadata {
this.resourceVersion = resourceVersion;
}
- public String getResoucreType() {
- return resoucreType;
+ public String getResourceType() {
+ return resourceType;
}
- public void setResoucreType(String resoucreType) {
- this.resoucreType = resoucreType;
+ public void setResourceType(String resourceType) {
+ this.resourceType = resourceType;
}
public String getResourceUUID() {