Merge "Fix the tosca converter"

4 files changed, 7 insertions, 17 deletions

diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index 69e9c7c15..29082abf1 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -692,7 +692,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:39237<br>
+<p><em>Host</em> : localhost:46347<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index 288511b3b..3ce033f64 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -176,4 +176,9 @@ clamp.config.security.permission.instance=dev
 clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal
 
 ## Tosca converter
-clamp.config.tosca.converter.templates=classpath:/clds/tosca_updates/templates.json
\ No newline at end of file
+clamp.config.tosca.converter.templates=classpath:/clds/tosca_updates/templates.json
+
+# Configuration settings for CDS
+clamp.config.cds.url=http4://blueprints-processor-http:8080
+clamp.config.cds.userName=ccsdkapps
+clamp.config.cds.password=ccsdkapps
\ No newline at end of file
diff --git a/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml b/src/main/resources/clds/tosca_update/default-tosca-types.yaml
index a11a73698..a11a73698 100644
--- a/src/main/resources/clds/tosca_update/defaultToscaTypes.yaml
+++ b/src/main/resources/clds/tosca_update/default-tosca-types.yaml
diff --git a/src/main/resources/clds/tosca_update/templates.properties b/src/main/resources/clds/tosca_update/templates.properties
deleted file mode 100644
index 5da239b1f..000000000
--- a/src/main/resources/clds/tosca_update/templates.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#Numeric types

-integer=type,description,title,deprecated,default,enum,const,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum

-number=type,description,title,deprecated,default,enum,const,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum

-range=type,description,title,deprecated,default,enum,const,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum

-#

-boolean=type,description,title,deprecated,default,enum,const,readOnly,writeOnly

-#String types

-string=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format

-timestamp=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format

-scalar-unit.time=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format

-scalar-unit.frequency=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format

-scalar-unit.size=type,description,title,deprecated,default,enum,const,minLength,maxLength,pattern,format

-#Complex types

-array=type,description,title,deprecated,default,enum,const,minItems,maxItems,uniqueItems,minContains,maxContains

-object=type,description,title,deprecated,default,enum,const,properties,minProperties,maxProperties,required,dependentRequired,dependencies,readOnly,writeOnly