fix issue in in alloted resource

update aloted template add it to upgrade normative
remove use of mail librery

Change-Id: Ie8922c6cce4ca10baaf401f7a7bfed436ceb585e
Issue-ID: SDC-1945
Signed-off-by: Michael Lando <michael.lando@intl.att.com>

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml
index 00d3bd2..cf7b5cc 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml
@@ -34,5 +34,4 @@ node_types:
     - service_dependency:
         capability: org.openecomp.capabilities.AllottedResource
         relationship: tosca.relationships.DependsOn
-        node: tosca.services.Root
 

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json
index 9101291..cbe581a 100644 (file)
--- a/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json
+++ b/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json
@@ -1,5 +1,6 @@
 {
   "nfv": [
+    "allottedResource"
   ],
   "onap": [
   ],

diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 058c4f8..f228905 100644 (file)
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -96,12 +96,6 @@
                        <scope>compile</scope>
                </dependency>
 
-               <dependency>
-                       <groupId>javax.mail</groupId>
-                       <artifactId>javax.mail-api</artifactId>
-                       <version>1.5.2</version>
-                       <scope>compile</scope>
-               </dependency>
 
                <dependency>
                        <groupId>org.glassfish.jersey.media</groupId>