diff options
9 files changed, 26 insertions, 28 deletions
diff --git a/config/application.properties b/config/application.properties index 68ac493..056cedc 100644 --- a/config/application.properties +++ b/config/application.properties @@ -18,9 +18,9 @@ server.tomcat.max-idle-time=60000 #Application properties
sdcConnect.username=pomba
-sdcConnect.password=OBF:1uha1uh81w8v1ugi1ugg
+sdcConnect.password=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
sdcConnect.consumerID=pomba
-sdcConnect.sdcAddress=10.69.100.139:30204
+sdcConnect.sdcAddress=10.12.5.121:30204
# Minimum timeout value is 15 seconds; default is 120000s
sdcConnect.timeout.seconds=12000
@@ -148,22 +148,20 @@ </exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+ <groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-distribution-client</artifactId>
- <version>1.2.3</version>
+ <version>1.3.0</version>
</dependency>
<dependency>
- <groupId>org.openecomp.sdc.sdc-tosca</groupId>
+ <groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
- <version>1.2.2</version>
+ <version>1.4.1</version>
</dependency>
-
<dependency>
- <groupId>org.openecomp.sdc.jtosca</groupId>
+ <groupId>org.onap.sdc.jtosca</groupId>
<artifactId>jtosca</artifactId>
- <version>1.2.1</version>
+ <version>1.4.4</version>
</dependency>
<dependency>
<groupId>net.sf.flexjson</groupId>
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java index 28157d1..379433e 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java @@ -20,7 +20,7 @@ package org.onap.pomba.contextbuilder.sdc; import java.util.Base64;
import lombok.Data;
import org.eclipse.jetty.util.security.Password;
-import org.openecomp.sdc.http.SdcConnectorClient;
+import org.onap.sdc.http.SdcConnectorClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -76,7 +76,7 @@ public class SDCClientConfiguration { sdcContextConfig.setActivateServerTLSAuth(false);
sdcContextConfig.setPollingTimeout(Integer.parseInt(pollingTimeout));
- org.openecomp.sdc.impl.Configuration config = new org.openecomp.sdc.impl.Configuration(sdcContextConfig);
+ org.onap.sdc.impl.Configuration config = new org.onap.sdc.impl.Configuration(sdcContextConfig);
client.init(config);
return client;
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java index a5ec9bc..d88ecb0 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java @@ -18,7 +18,7 @@ package org.onap.pomba.contextbuilder.sdc;
import java.util.List;
-import org.openecomp.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.api.consumer.IConfiguration;
public class SDCContextConfig implements IConfiguration {
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java index 8e3d179..4e540b8 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java @@ -20,7 +20,7 @@ package org.onap.pomba.contextbuilder.sdc.model; import java.util.List;
import lombok.Data;
import lombok.ToString;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
@Data
@ToString(includeFieldNames = true)
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java index bea574f..9fac21e 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java @@ -33,12 +33,12 @@ import org.onap.pomba.contextbuilder.sdc.ToscaBuilderConfig; import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException;
import org.onap.pomba.contextbuilder.sdc.model.ArtifactInfo;
import org.onap.pomba.contextbuilder.sdc.model.SDCContextResponse;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.http.SdcConnectorClient;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.http.SdcConnectorClient;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.utils.DistributionActionResultEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java index 1e7580d..a1c6779 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java @@ -25,11 +25,11 @@ import org.onap.pomba.common.datatypes.VF; import org.onap.pomba.common.datatypes.VFModule;
import org.onap.pomba.common.datatypes.VNFC;
import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
public class ToscaModelConverter {
diff --git a/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java b/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java index 01902f0..5f58fad 100644 --- a/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java +++ b/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test;
import org.onap.pomba.contextbuilder.sdc.model.ArtifactInfo;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
public class ArtifactInfoTest {
diff --git a/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java b/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java index 8567b75..7bd5f86 100644 --- a/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java +++ b/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java @@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals; import org.eclipse.jetty.util.security.Password;
import org.junit.Test;
import org.onap.pomba.contextbuilder.sdc.SDCClientConfiguration;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.http.SdcConnectorClient;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.http.SdcConnectorClient;
public class SDCClientConfigurationTest {
|