SDN Controller Blueprints Processor

Changing Date Format to consume Blueprints Model Artifact

Change-Id: I97c4c36f811cdd0738272efc88060fa8ca618384
Issue-ID: CCSDK-596
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java
index df4912c..d88acca 100644 (file)
--- a/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/java/org/onap/ccsdk/features/data/adaptor/DataAdaptorConstants.java
@@ -23,7 +23,7 @@ public class DataAdaptorConstants {
     public static final String OUTPUT_STATUS_SUCCESS = "success";\r
     public static final String OUTPUT_STATUS_FAILURE = "failure";\r
 \r
-    public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.features.rest.adaptors.envtype";\r
+    public static final String PROPERTY_ENV_TYPE = "org.onap.ccsdk.features.blueprints.adaptors.envtype";\r
     public static final String PROPERTY_ENV_PROD = "field";\r
     public static final String PROPERTY_ENV_SOLO = "solo";\r
 \r

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
index da35c4b..adb00a3 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/features/rest/adaptor/ConfigRestAdaptorConstants.java
@@ -1 +1 @@
-/*\r * Copyright © 2017-2018 AT&T Intellectual Property.\r * Modifications Copyright © 2018 IBM.\r * \r * Licensed under the Apache License, Version 2.0 (the "License");\r * you may not use this file except in compliance with the License.\r * You may obtain a copy of the License at\r * \r * http://www.apache.org/licenses/LICENSE-2.0\r * \r * Unless required by applicable law or agreed to in writing, software\r * distributed under the License is distributed on an "AS IS" BASIS,\r * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r * See the License for the specific language governing permissions and\r * limitations under the License.\r */\r\rpackage org.onap.ccsdk.features.rest.adaptor;\r\rpublic class ConfigRestAdaptorConstants {\r    private ConfigRestAdaptorConstants() {\r\r    }\r\r    public static final String SDNC_ROOT_DIR_ENV_VAR_KEY = "SDNC_CONFIG_DIR";\r    public static final String REST_ADAPTOR_PROPERTIES_FILE_NAME = "blueprints-processor-adaptor.properties";\r    public static final String PROXY_URL_KEY = "proxyUrl";\r    public static final String PROXY_URLS_VALUE_SEPARATOR = ",";\r    public static final String AAF_USERNAME_KEY = "aafUserName";\r    public static final String AAF_PSSWD_KEY = "aafPassword";\r    public static final String COMMON_SERVICE_VERSION_KEY = "commonServiceVersion";\r\r    public static final String PROPERTY_ENV_PROD = "field";\r    public static final String PROPERTY_ENV_SOLO = "solo";\r\r    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.rest.adaptors.";\r    public static final String REST_ADAPTOR_ENV_TYPE = "envtype";\r    public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";\r    public static final String REST_ADAPTOR_TYPE_SSL = "ssl";\r\r    public static final String SSL_SERVICE_BASEURL = ".url";\r    public static final String SSL_SERVICE_APP = ".application";\r    public static final String SSL_SERVICE_TRUST = ".ssl.trust";\r    public static final String SSL_SERVICE_TRUST_PSSWD = ".ssl.trust.psswd";\r    public static final String SSL_SERVICE_KEY = ".ssl.key";\r    public static final String SSL_SERVICE_KEY_PSSWD = ".ssl.key.psswd";\r\r    public static final String SERVICE_TYPE_PROPERTY = ".type";\r    public static final String SERVICE_EANABLED_PROPERTY = ".enable";\r    public static final String SERVICE_ENV_PROPERTY = ".env";\r    public static final String SERVICE_BASEURL_PROPERTY = ".url";\r    public static final String SERVICE_PROPERTYFILE = ".propertyfile";\r    public static final String SERVICE_USER_PROPERTY = ".user";\r    public static final String SERVICE_APPID_PROPERTY = ".appId";\r    public static final String SERVICE_PSSWD_PROPERTY = ".passwd";\r    public static final String SERVICE_CLIENTAUTH_PROPERTY = ".clientAuth";\r    public static final String SERVICE_AUTHORIZATION_PROPERTY = ".authorization";\r\r    public static final String SELECTOR_AAI = "aai";\r    public static final String SELECTOR_ALTS = "alts";\r    public static final String SELECTOR_EIPAM = "eipam";\r    public static final String SELECTOR_COSMS = "cosms";\r    public static final String SELECTOR_RESTCONF = "restconf";\r    public static final String SELECTOR_MODEL_SERVICE = "modelservice";\r    public static final String SELECTOR_POLICY_MANAGER = "policymanager";\r    public static final String SELECTOR_NRD = "networkresourcediscovery";\r    public static final String SELECTOR_NSM = "nsm";\r\r}\r
\ No newline at end of file
+/*\r * Copyright © 2017-2018 AT&T Intellectual Property.\r * Modifications Copyright © 2018 IBM.\r * \r * Licensed under the Apache License, Version 2.0 (the "License");\r * you may not use this file except in compliance with the License.\r * You may obtain a copy of the License at\r * \r * http://www.apache.org/licenses/LICENSE-2.0\r * \r * Unless required by applicable law or agreed to in writing, software\r * distributed under the License is distributed on an "AS IS" BASIS,\r * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r * See the License for the specific language governing permissions and\r * limitations under the License.\r */\r\rpackage org.onap.ccsdk.features.rest.adaptor;\r\rpublic class ConfigRestAdaptorConstants {\r    private ConfigRestAdaptorConstants() {\r\r    }\r\r    public static final String SDNC_ROOT_DIR_ENV_VAR_KEY = "SDNC_CONFIG_DIR";\r    public static final String REST_ADAPTOR_PROPERTIES_FILE_NAME = "blueprints-processor-adaptor.properties";\r    public static final String PROXY_URL_KEY = "proxyUrl";\r    public static final String PROXY_URLS_VALUE_SEPARATOR = ",";\r    public static final String AAF_USERNAME_KEY = "aafUserName";\r    public static final String AAF_PSSWD_KEY = "aafPassword";\r    public static final String COMMON_SERVICE_VERSION_KEY = "commonServiceVersion";\r\r    public static final String PROPERTY_ENV_PROD = "field";\r    public static final String PROPERTY_ENV_SOLO = "solo";\r\r    public static final String REST_ADAPTOR_BASE_PROPERTY = "org.onap.ccsdk.features.blueprints.adaptors.";\r    public static final String REST_ADAPTOR_ENV_TYPE = "envtype";\r    public static final String REST_ADAPTOR_TYPE_GENERIC = "generic";\r    public static final String REST_ADAPTOR_TYPE_SSL = "ssl";\r\r    public static final String SSL_SERVICE_BASEURL = ".url";\r    public static final String SSL_SERVICE_APP = ".application";\r    public static final String SSL_SERVICE_TRUST = ".ssl.trust";\r    public static final String SSL_SERVICE_TRUST_PSSWD = ".ssl.trust.psswd";\r    public static final String SSL_SERVICE_KEY = ".ssl.key";\r    public static final String SSL_SERVICE_KEY_PSSWD = ".ssl.key.psswd";\r\r    public static final String SERVICE_TYPE_PROPERTY = ".type";\r    public static final String SERVICE_EANABLED_PROPERTY = ".enable";\r    public static final String SERVICE_ENV_PROPERTY = ".env";\r    public static final String SERVICE_BASEURL_PROPERTY = ".url";\r    public static final String SERVICE_PROPERTYFILE = ".propertyfile";\r    public static final String SERVICE_USER_PROPERTY = ".user";\r    public static final String SERVICE_APPID_PROPERTY = ".appId";\r    public static final String SERVICE_PSSWD_PROPERTY = ".passwd";\r    public static final String SERVICE_CLIENTAUTH_PROPERTY = ".clientAuth";\r    public static final String SERVICE_AUTHORIZATION_PROPERTY = ".authorization";\r\r    public static final String SELECTOR_AAI = "aai";\r    public static final String SELECTOR_ALTS = "alts";\r    public static final String SELECTOR_EIPAM = "eipam";\r    public static final String SELECTOR_COSMS = "cosms";\r    public static final String SELECTOR_RESTCONF = "restconf";\r    public static final String SELECTOR_MODEL_SERVICE = "modelservice";\r    public static final String SELECTOR_POLICY_MANAGER = "policymanager";\r    public static final String SELECTOR_NRD = "networkresourcediscovery";\r    public static final String SELECTOR_NSM = "nsm";\r\r}\r
\ No newline at end of file

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties
index 66ee4c0..82f4fcb 100644 (file)
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/test/resources/blueprints-processor-adaptor.properties
@@ -18,28 +18,28 @@
 # Configuration file for SDNC Controller Module
 #
 
-org.onap.ccsdk.features.rest.adaptors.envtype=solo
+org.onap.ccsdk.features.blueprints.adaptors.envtype=solo
 
 # Config Generator Microservices
-org.onap.ccsdk.features.rest.adaptors.modelservice.type=generic
-org.onap.ccsdk.features.rest.adaptors.modelservice.enable=true
-org.onap.ccsdk.features.rest.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
-org.onap.ccsdk.features.rest.adaptors.modelservice.user=admin
-org.onap.ccsdk.features.rest.adaptors.modelservice.passwd=admin
+org.onap.ccsdk.features.blueprints.adaptors.modelservice.type=generic
+org.onap.ccsdk.features.blueprints.adaptors.modelservice.enable=true
+org.onap.ccsdk.features.blueprints.adaptors.modelservice.url=http://localhost:8080/configgenerator/service/
+org.onap.ccsdk.features.blueprints.adaptors.modelservice.user=admin
+org.onap.ccsdk.features.blueprints.adaptors.modelservice.passwd=admin
 
 # Generic RESTCONF Adaptor
-org.onap.ccsdk.features.rest.adaptors.restconf.type=generic
-org.onap.ccsdk.features.rest.adaptors.restconf.enable=true
-org.onap.ccsdk.features.rest.adaptors.restconf.user=admin
-org.onap.ccsdk.features.rest.adaptors.restconf.passwd=admin
-org.onap.ccsdk.features.rest.adaptors.restconf.url=http://localhost:8181/restconf/
+org.onap.ccsdk.features.blueprints.adaptors.restconf.type=generic
+org.onap.ccsdk.features.blueprints.adaptors.restconf.enable=true
+org.onap.ccsdk.features.blueprints.adaptors.restconf.user=admin
+org.onap.ccsdk.features.blueprints.adaptors.restconf.passwd=admin
+org.onap.ccsdk.features.blueprints.adaptors.restconf.url=http://localhost:8181/restconf/
 
 # SSL AAI Adaptor
-org.onap.ccsdk.features.rest.adaptors.aai.propertyfile=aai.properties
-org.onap.ccsdk.features.rest.adaptors.aai.type=ssl
-org.onap.ccsdk.features.rest.adaptors.aai.enable=true
-org.onap.ccsdk.features.rest.adaptors.aai.url=https://localhost:8443/onap-aai/
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.trust.psswd=changeme
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
-org.onap.ccsdk.features.rest.adaptors.aai.ssl.key.psswd=changeme
+org.onap.ccsdk.features.blueprints.adaptors.aai.propertyfile=aai.properties
+org.onap.ccsdk.features.blueprints.adaptors.aai.type=ssl
+org.onap.ccsdk.features.blueprints.adaptors.aai.enable=true
+org.onap.ccsdk.features.blueprints.adaptors.aai.url=https://localhost:8443/onap-aai/
+org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.trust=src/test/resources/truststore.client.jks
+org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.trust.psswd=changeme
+org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.key=src/test/resources/keystore.client.p12
+org.onap.ccsdk.features.blueprints.adaptors.aai.ssl.key.psswd=changeme

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java
index b288041..9f852c1 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/ResourceAssignment.java
@@ -56,7 +56,7 @@ public class ResourceAssignment {
     private String message;\r
 \r
     @JsonProperty("updated-date")\r
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy hh:mm:ss")\r
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")\r
     private Date updatedDate;\r
 \r
     @JsonProperty("updated-by")\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java
index 97862b8..66de05b 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModel.java
@@ -39,7 +39,7 @@ public class ConfigModel implements Serializable {
     private String artifactVersion;\r
     private String artifactDescription;\r
     private Integer internalVersion;\r
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MM/dd/yyyy KK:mm:ss a Z")\r
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")\r
     private Date createdDate = new Date();\r
     private String artifactName;\r
     private String published;\r

diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
index b820b12..4c55e75 100644 (file)
--- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
+++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/domain/ConfigModelContent.java
@@ -27,7 +27,7 @@ public class ConfigModelContent {
     private String contentType;\r
     private String description;\r
     private String content;\r
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "MM/dd/yyyy KK:mm:ss a Z")\r
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")\r
     private Date createdDate = new Date();\r
 \r
     @Override\r