push addional code

Change-Id: Ia427bb3460cda3a896f8faced2de69eaf3807b74
Signed-off-by: Michael Lando <ml636r@att.com>

12 files changed, 858 insertions, 0 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraFactoryImpl.java
new file mode 100644
index 0000000000..13e351c257
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraFactoryImpl.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+
+import org.openecomp.core.model.dao.EnrichedServiceArtifactDao;
+import org.openecomp.core.model.dao.EnrichedServiceArtifactDaoFactory;
+
+public class EnrichedServiceArtifactDaoCassandraFactoryImpl
+    extends EnrichedServiceArtifactDaoFactory {
+  private static final EnrichedServiceArtifactDao INSTANCE =
+      new EnrichedServiceArtifactDaoCassandraImpl();
+
+  @Override
+  public EnrichedServiceArtifactDao createInterface() {
+    return INSTANCE;
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraImpl.java
new file mode 100644
index 0000000000..d9ebe849e3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceArtifactDaoCassandraImpl.java
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.UDTValue;
+import com.datastax.driver.mapping.Mapper;
+import com.datastax.driver.mapping.Result;
+import com.datastax.driver.mapping.UDTMapper;
+import com.datastax.driver.mapping.annotations.Accessor;
+import com.datastax.driver.mapping.annotations.Query;
+import org.openecomp.core.model.dao.EnrichedServiceArtifactDao;
+import org.openecomp.core.model.types.EnrichedServiceArtifactEntity;
+import org.openecomp.core.model.types.ServiceArtifact;
+import org.openecomp.core.nosqldb.api.NoSqlDb;
+import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
+import org.openecomp.sdc.versioning.VersioningManagerFactory;
+import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdc.versioning.types.VersionableEntityMetadata;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class EnrichedServiceArtifactDaoCassandraImpl implements EnrichedServiceArtifactDao {
+
+  private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
+  private static final Mapper<EnrichedServiceArtifactEntity> mapper =
+      noSqlDb.getMappingManager().mapper(EnrichedServiceArtifactEntity.class);
+  private static final VspServiceArtifactAccessor accessor =
+      noSqlDb.getMappingManager().createAccessor(VspServiceArtifactAccessor.class);
+  private static final UDTMapper<Version> versionMapper =
+      noSqlDb.getMappingManager().udtMapper(Version.class);
+
+  @Override
+  public void registerVersioning(String versionableEntityType) {
+    VersioningManagerFactory.getInstance().createInterface()
+        .register(versionableEntityType, new VersionableEntityMetadata(
+            mapper.getTableMetadata().getName(),
+            mapper.getTableMetadata().getPartitionKey().get(0).getName(),
+            mapper.getTableMetadata().getPartitionKey().get(1).getName()));
+  }
+
+  @Override
+  public Collection<ServiceArtifact> list(String vspId, Version version) {
+    List<EnrichedServiceArtifactEntity> entityList;
+    if (vspId != null && version != null) {
+      entityList = accessor.list(vspId, versionMapper.toUDT(version)).all();
+    } else {
+      entityList = accessor.listAll().all();
+    }
+
+    return entityList.stream().map(entity -> entity.getServiceArtifact())
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void create(ServiceArtifact entity) {
+    EnrichedServiceArtifactEntity vspEnrichedServiceArtifactEntity =
+        new EnrichedServiceArtifactEntity(entity);
+    mapper.save(vspEnrichedServiceArtifactEntity);
+  }
+
+  @Override
+  public void update(ServiceArtifact entity) {
+    EnrichedServiceArtifactEntity vspEnrichedServiceArtifactEntity =
+        new EnrichedServiceArtifactEntity(entity);
+    mapper.save(vspEnrichedServiceArtifactEntity);
+  }
+
+  @Override
+  public ServiceArtifact get(String vspId, Version version) {
+    return mapper.get(getKeys(vspId, version)).getServiceArtifact();
+  }
+
+  @Override
+  public void delete(String vspId, Version version) {
+    accessor.delete(vspId, versionMapper.toUDT(version));
+  }
+
+  @Override
+  public Object[] getKeys(String vspId, Version version) {
+    return new Object[]{vspId, versionMapper.toUDT(version)};
+  }
+
+  @Override
+  public ServiceArtifact getArtifactInfo(String vspId, Version version, String name) {
+    EnrichedServiceArtifactEntity enrichedServiceArtifactEntity =
+        accessor.getArtifactInfo(vspId, versionMapper.toUDT(version), name).one();
+    if (enrichedServiceArtifactEntity == null) {
+      return null;
+    }
+
+    return enrichedServiceArtifactEntity.getServiceArtifact();
+  }
+
+
+  @Accessor
+  interface VspServiceArtifactAccessor {
+
+    @Query("SELECT vsp_id, version, name ,content_data FROM vsp_enriched_service_artifact")
+    Result<EnrichedServiceArtifactEntity> listAll();
+
+    @Query(
+        "SELECT vsp_id, version, name ,content_data FROM vsp_enriched_service_artifact "
+            + "where vsp_id=? and version=? ")
+    Result<EnrichedServiceArtifactEntity> list(String vspId, UDTValue version);
+
+
+    @Query(
+        "SELECT vsp_id,version,name,content_data FROM vsp_enriched_service_artifact "
+            + "where vsp_id=? and version=? and name=?")
+    Result<EnrichedServiceArtifactEntity> getArtifactInfo(String vspId, UDTValue version,
+                                                          String name);
+
+    @Query("DELETE from vsp_enriched_service_artifact where vsp_id=? and version=?")
+    ResultSet delete(String vspId, UDTValue version);
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoFactoryImpl.java
new file mode 100644
index 0000000000..326e5e78fc
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoFactoryImpl.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+
+import org.openecomp.core.model.dao.EnrichedServiceModelDao;
+import org.openecomp.core.model.dao.EnrichedServiceModelDaoFactory;
+
+public class EnrichedServiceModelDaoFactoryImpl extends EnrichedServiceModelDaoFactory {
+  private static final EnrichedServiceModelDao INSTANCE = new EnrichedServiceModelDaoImpl();
+
+  @Override
+  public EnrichedServiceModelDao createInterface() {
+    return INSTANCE;
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoImpl.java
new file mode 100644
index 0000000000..9e784c7fef
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceModelDaoImpl.java
@@ -0,0 +1,44 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+import org.openecomp.core.model.dao.EnrichedServiceArtifactDaoFactory;
+import org.openecomp.core.model.dao.EnrichedServiceModelDao;
+import org.openecomp.core.model.dao.EnrichedServiceTemplateDaoFactory;
+import org.openecomp.core.model.types.ServiceArtifact;
+import org.openecomp.core.model.types.ServiceElement;
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
+import org.openecomp.sdc.versioning.dao.types.Version;
+
+import java.util.List;
+
+public class EnrichedServiceModelDaoImpl extends AbstractServiceModelDao
+    implements EnrichedServiceModelDao<ToscaServiceModel, ServiceElement> {
+  public EnrichedServiceModelDaoImpl() {
+    templateDao = EnrichedServiceTemplateDaoFactory.getInstance().createInterface();
+    artifactDao = EnrichedServiceArtifactDaoFactory.getInstance().createInterface();
+  }
+
+  @Override
+  public List<ServiceArtifact> getExternalArtifacts(String vspId, Version version) {
+    return (List<ServiceArtifact>) artifactDao.list(vspId, version);
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraFactoryImpl.java
new file mode 100644
index 0000000000..8103b2cea6
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraFactoryImpl.java
@@ -0,0 +1,36 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+
+import org.openecomp.core.model.dao.EnrichedServiceTemplateDao;
+import org.openecomp.core.model.dao.EnrichedServiceTemplateDaoFactory;
+
+public class EnrichedServiceTemplateDaoCassandraFactoryImpl
+    extends EnrichedServiceTemplateDaoFactory {
+  private static final EnrichedServiceTemplateDao INSTANCE =
+      new EnrichedServiceTemplateDaoCassandraImpl();
+
+  @Override
+  public EnrichedServiceTemplateDao createInterface() {
+    return INSTANCE;
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraImpl.java
new file mode 100644
index 0000000000..f0d4b56204
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/EnrichedServiceTemplateDaoCassandraImpl.java
@@ -0,0 +1,147 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+import com.datastax.driver.core.UDTValue;
+import com.datastax.driver.mapping.Mapper;
+import com.datastax.driver.mapping.Result;
+import com.datastax.driver.mapping.UDTMapper;
+import com.datastax.driver.mapping.annotations.Accessor;
+import com.datastax.driver.mapping.annotations.Query;
+import org.openecomp.core.model.dao.EnrichedServiceTemplateDao;
+import org.openecomp.core.model.types.EnrichedServiceTemplateEntity;
+import org.openecomp.core.model.types.ServiceTemplate;
+import org.openecomp.core.nosqldb.api.NoSqlDb;
+import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
+import org.openecomp.sdc.versioning.VersioningManagerFactory;
+import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdc.versioning.types.VersionableEntityMetadata;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class EnrichedServiceTemplateDaoCassandraImpl implements EnrichedServiceTemplateDao {
+
+  private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
+  private static final Mapper<EnrichedServiceTemplateEntity> mapper =
+      noSqlDb.getMappingManager().mapper(EnrichedServiceTemplateEntity.class);
+  private static final VspServiceTemplateAccessor accessor =
+      noSqlDb.getMappingManager().createAccessor(VspServiceTemplateAccessor.class);
+  private static final UDTMapper<Version> versionMapper =
+      noSqlDb.getMappingManager().udtMapper(Version.class);
+
+  @Override
+  public void registerVersioning(String versionableEntityType) {
+    VersioningManagerFactory.getInstance().createInterface()
+        .register(versionableEntityType, new VersionableEntityMetadata(
+            mapper.getTableMetadata().getName(),
+            mapper.getTableMetadata().getPartitionKey().get(0).getName(),
+            mapper.getTableMetadata().getPartitionKey().get(1).getName()));
+  }
+
+  @Override
+  public Collection<ServiceTemplate> list(String vspId, Version version) {
+
+    List<EnrichedServiceTemplateEntity> entityList = accessor.list(vspId, version).all();
+    return entityList.stream().map(entity -> entity.getServiceTemplate())
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void create(ServiceTemplate entity) {
+    EnrichedServiceTemplateEntity vspEnrichedServiceTemplateEntity =
+        new EnrichedServiceTemplateEntity(entity);
+    mapper.save(vspEnrichedServiceTemplateEntity);
+  }
+
+  @Override
+  public void update(ServiceTemplate entity) {
+    EnrichedServiceTemplateEntity vspEnrichedServiceTemplateEntity =
+        new EnrichedServiceTemplateEntity(entity);
+    mapper.save(vspEnrichedServiceTemplateEntity);
+  }
+
+  @Override
+  public ServiceTemplate get(String vspId, Version version) {
+    return (mapper.get(getKeys(vspId, version))).getServiceTemplate();
+  }
+
+  @Override
+  public void delete(String vspId, Version version) {
+    mapper.delete(vspId, version);
+  }
+
+
+  @Override
+  public Object[] getKeys(String vspId, Version version) {
+    return new Object[]{vspId, versionMapper.toUDT(version)};
+  }
+
+  @Override
+  public ServiceTemplate getTemplateInfo(String vspId, Version version, String name) {
+    EnrichedServiceTemplateEntity enrichedServiceTemplateEntity =
+        accessor.getTemplateInfo(vspId, versionMapper.toUDT(version), name).one();
+    if (enrichedServiceTemplateEntity == null) {
+      return null;
+    }
+    return enrichedServiceTemplateEntity.getServiceTemplate();
+  }
+
+  @Override
+  public String getBase(String vspId, Version version) {
+    Result<EnrichedServiceTemplateEntity> element =
+        accessor.getBase(vspId, versionMapper.toUDT(version));
+    if (element != null) {
+      EnrichedServiceTemplateEntity vspEnrichedServiceTemplateEntity = element.one();
+      if (vspEnrichedServiceTemplateEntity != null) {
+        return element.one().getBaseName();
+      }
+    }
+    return null;
+  }
+
+
+  @Accessor
+  interface VspServiceTemplateAccessor {
+
+    @Query(
+        "SELECT vsp_id, version, name, base_name ,content_data FROM vsp_enriched_service_template")
+    Result<EnrichedServiceTemplateEntity> listAll();
+
+    @Query(
+        "SELECT vsp_id, version, name, base_name ,content_data FROM vsp_enriched_service_template "
+            + "where vsp_id=? and version=?")
+    Result<EnrichedServiceTemplateEntity> list(String vspId, Version version);
+
+
+    @Query(
+        "SELECT vsp_id, version, name, base_name ,content_data FROM vsp_enriched_service_template "
+            + "where vsp_id=? and version=? and name=?")
+    Result<EnrichedServiceTemplateEntity> getTemplateInfo(String vspId, UDTValue version,
+                                                          String name);
+
+    @Query(
+        "SELECT vsp_id, version, name, base_name  FROM vsp_enriched_service_template "
+            + "where vsp_id=? and version=?")
+    Result<EnrichedServiceTemplateEntity> getBase(String vspId, UDTValue version);
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraFactoryImpl.java
new file mode 100644
index 0000000000..f24fb1b475
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraFactoryImpl.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+
+import org.openecomp.core.model.dao.ServiceArtifactDao;
+import org.openecomp.core.model.dao.ServiceArtifactDaoFactory;
+
+public class ServiceArtifactDaoCassandraFactoryImpl extends ServiceArtifactDaoFactory {
+  private static final ServiceArtifactDao INSTANCE = new ServiceArtifactDaoCassandraImpl();
+
+  @Override
+  public ServiceArtifactDao createInterface() {
+    return INSTANCE;
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraImpl.java
new file mode 100644
index 0000000000..c7851c0fd9
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceArtifactDaoCassandraImpl.java
@@ -0,0 +1,139 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.UDTValue;
+import com.datastax.driver.mapping.Mapper;
+import com.datastax.driver.mapping.Result;
+import com.datastax.driver.mapping.UDTMapper;
+import com.datastax.driver.mapping.annotations.Accessor;
+import com.datastax.driver.mapping.annotations.Query;
+import org.openecomp.core.model.dao.ServiceArtifactDao;
+import org.openecomp.core.model.types.ServiceArtifact;
+import org.openecomp.core.model.types.ServiceArtifactEntity;
+import org.openecomp.core.nosqldb.api.NoSqlDb;
+import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
+import org.openecomp.sdc.versioning.VersioningManagerFactory;
+import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdc.versioning.types.VersionableEntityMetadata;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ServiceArtifactDaoCassandraImpl implements ServiceArtifactDao {
+
+  private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
+  private static final Mapper<ServiceArtifactEntity> mapper =
+      noSqlDb.getMappingManager().mapper(ServiceArtifactEntity.class);
+  private static final VspServiceArtifactAccessor accessor =
+      noSqlDb.getMappingManager().createAccessor(VspServiceArtifactAccessor.class);
+  private static final UDTMapper<Version> versionMapper =
+      noSqlDb.getMappingManager().udtMapper(Version.class);
+
+  @Override
+  public void registerVersioning(String versionableEntityType) {
+    VersioningManagerFactory.getInstance().createInterface()
+        .register(versionableEntityType, new VersionableEntityMetadata(
+            mapper.getTableMetadata().getName(),
+            mapper.getTableMetadata().getPartitionKey().get(0).getName(),
+            mapper.getTableMetadata().getPartitionKey().get(1).getName()));
+  }
+
+  @Override
+  public Collection<ServiceArtifact> list(String vspId, Version version) {
+    List<ServiceArtifactEntity> entityList;
+    if (vspId != null && version != null) {
+      entityList = accessor.list(vspId, versionMapper.toUDT(version)).all();
+    } else {
+      entityList = accessor.listAll().all();
+    }
+
+    return entityList.stream().map(entity -> entity.getServiceArtifact())
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void create(ServiceArtifact entity) {
+    ServiceArtifactEntity vspServiceArtifactEntity = new ServiceArtifactEntity(entity);
+    mapper.save(vspServiceArtifactEntity);
+  }
+
+  @Override
+  public void update(ServiceArtifact entity) {
+    ServiceArtifactEntity vspServiceArtifactEntity = new ServiceArtifactEntity(entity);
+    mapper.save(vspServiceArtifactEntity);
+  }
+
+  @Override
+  public ServiceArtifact get(String vspId, Version version) {
+    return mapper.get(getKeys(vspId, version)).getServiceArtifact();
+  }
+
+  @Override
+  public void delete(String vspId, Version version) {
+    accessor.delete(vspId, versionMapper.toUDT(version));
+  }
+
+  //    @Override
+  //    public void deleteArtifacts(String vspId, Version version){
+  //        accessor.delete(vspId, versionMapper.toUDT(version));
+  //    }
+
+  @Override
+  public Object[] getKeys(String vspId, Version version) {
+    return new Object[]{vspId, versionMapper.toUDT(version)};
+  }
+
+  @Override
+  public ServiceArtifact getArtifactInfo(String vspId, Version version, String name) {
+    ServiceArtifactEntity serviceArtifactEntity =
+        accessor.getArtifactInfo(vspId, versionMapper.toUDT(version), name).one();
+    if (serviceArtifactEntity == null) {
+      return null;
+    }
+
+    return serviceArtifactEntity.getServiceArtifact();
+  }
+
+
+  @Accessor
+  interface VspServiceArtifactAccessor {
+
+    @Query("SELECT vsp_id, version, name ,content_data FROM vsp_service_artifact")
+    Result<ServiceArtifactEntity> listAll();
+
+    @Query(
+        "SELECT vsp_id, version, name ,content_data "
+                + "FROM vsp_service_artifact where vsp_id=? and version=? ")
+    Result<ServiceArtifactEntity> list(String vspId, UDTValue version);
+
+    @Query(
+        "SELECT vsp_id,version,name,content_data FROM "
+                + "vsp_service_artifact where vsp_id=? and version=? and name=?")
+    Result<ServiceArtifactEntity> getArtifactInfo(String vspId, UDTValue version, String name);
+
+    @Query("DELETE from vsp_service_artifact where vsp_id=? and version=?")
+    ResultSet delete(String vspId, UDTValue version);
+  }
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoFactoryImpl.java
new file mode 100644
index 0000000000..1347636bf1
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoFactoryImpl.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+
+import org.openecomp.core.model.dao.ServiceModelDao;
+import org.openecomp.core.model.dao.ServiceModelDaoFactory;
+
+public class ServiceModelDaoFactoryImpl extends ServiceModelDaoFactory {
+  private static final ServiceModelDao INSTANCE = new ServiceModelDaoImpl();
+
+  @Override
+  public ServiceModelDao createInterface() {
+    return INSTANCE;
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoImpl.java
new file mode 100644
index 0000000000..c397aec61d
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceModelDaoImpl.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+import org.openecomp.core.model.dao.ServiceArtifactDaoFactory;
+import org.openecomp.core.model.dao.ServiceModelDao;
+import org.openecomp.core.model.dao.ServiceTemplateDaoFactory;
+import org.openecomp.core.model.types.ServiceElement;
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
+
+public class ServiceModelDaoImpl extends AbstractServiceModelDao
+    implements ServiceModelDao<ToscaServiceModel, ServiceElement> {
+
+
+  public ServiceModelDaoImpl() {
+    templateDao = ServiceTemplateDaoFactory.getInstance().createInterface();
+    artifactDao = ServiceArtifactDaoFactory.getInstance().createInterface();
+  }
+
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraFactoryImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraFactoryImpl.java
new file mode 100644
index 0000000000..23c43b76d3
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraFactoryImpl.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+
+import org.openecomp.core.model.dao.ServiceTemplateDao;
+import org.openecomp.core.model.dao.ServiceTemplateDaoFactory;
+
+public class ServiceTemplateDaoCassandraFactoryImpl extends ServiceTemplateDaoFactory {
+  private static final ServiceTemplateDao INSTANCE = new ServiceTemplateDaoCassandraImpl();
+
+  @Override
+  public ServiceTemplateDao createInterface() {
+    return INSTANCE;
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraImpl.java b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraImpl.java
new file mode 100644
index 0000000000..ffc9a24677
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-model-lib/openecomp-sdc-model-impl/src/main/java/org/openecomp/sdc/model/impl/ServiceTemplateDaoCassandraImpl.java
@@ -0,0 +1,145 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.model.impl;
+
+import com.datastax.driver.core.UDTValue;
+import com.datastax.driver.mapping.Mapper;
+import com.datastax.driver.mapping.Result;
+import com.datastax.driver.mapping.UDTMapper;
+import com.datastax.driver.mapping.annotations.Accessor;
+import com.datastax.driver.mapping.annotations.Query;
+import org.openecomp.core.model.dao.ServiceTemplateDao;
+import org.openecomp.core.model.types.ServiceTemplate;
+import org.openecomp.core.model.types.ServiceTemplateEntity;
+import org.openecomp.core.nosqldb.api.NoSqlDb;
+import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
+import org.openecomp.sdc.versioning.VersioningManagerFactory;
+import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdc.versioning.types.VersionableEntityMetadata;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ServiceTemplateDaoCassandraImpl implements ServiceTemplateDao {
+
+
+  private static final NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
+  private static final Mapper<ServiceTemplateEntity> mapper =
+      noSqlDb.getMappingManager().mapper(ServiceTemplateEntity.class);
+  private static final VspServiceTemplateAccessor accessor =
+      noSqlDb.getMappingManager().createAccessor(VspServiceTemplateAccessor.class);
+  private static final UDTMapper<Version> versionMapper =
+      noSqlDb.getMappingManager().udtMapper(Version.class);
+
+  @Override
+  public void registerVersioning(String versionableEntityType) {
+    VersioningManagerFactory.getInstance().createInterface()
+        .register(versionableEntityType, new VersionableEntityMetadata(
+            mapper.getTableMetadata().getName(),
+            mapper.getTableMetadata().getPartitionKey().get(0).getName(),
+            mapper.getTableMetadata().getPartitionKey().get(1).getName()));
+  }
+
+  @Override
+  public Collection<ServiceTemplate> list(String vspId, Version version) {
+
+    List<ServiceTemplateEntity> entityList = accessor.list(vspId, version).all();
+    return entityList.stream().map(entity -> entity.getServiceTemplate())
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void create(ServiceTemplate entity) {
+    ServiceTemplateEntity vspServiceTemplateEntity = new ServiceTemplateEntity(entity);
+    mapper.save(vspServiceTemplateEntity);
+  }
+
+  @Override
+  public void update(ServiceTemplate entity) {
+    ServiceTemplateEntity vspServiceTemplateEntity = new ServiceTemplateEntity(entity);
+    mapper.save(vspServiceTemplateEntity);
+  }
+
+  @Override
+  public ServiceTemplate get(String vspId, Version version) {
+    return (mapper.get(getKeys(vspId, version))).getServiceTemplate();
+  }
+
+  @Override
+  public void delete(String vspId, Version version) {
+    mapper.delete(vspId, version);
+  }
+
+
+  @Override
+  public Object[] getKeys(String vspId, Version version) {
+    return new Object[]{vspId, versionMapper.toUDT(version)};
+  }
+
+  @Override
+  public ServiceTemplate getTemplateInfo(String vspId, Version version, String name) {
+    ServiceTemplateEntity serviceTemplateEntity =
+        accessor.getTemplateInfo(vspId, versionMapper.toUDT(version), name).one();
+    if (serviceTemplateEntity == null) {
+      return null;
+    }
+    return serviceTemplateEntity.getServiceTemplate();
+  }
+
+  @Override
+  public String getBase(String vspId, Version version) {
+    Result<ServiceTemplateEntity> element = accessor.getBase(vspId, versionMapper.toUDT(version));
+    if (element != null) {
+      ServiceTemplateEntity vspServiceTemplateEntity = element.one();
+      if (vspServiceTemplateEntity != null) {
+        return element.one().getBaseName();
+      }
+    }
+    return null;
+  }
+
+
+  @Accessor
+  interface VspServiceTemplateAccessor {
+
+    @Query("SELECT vsp_id, version, name, base_name ,content_data FROM vsp_service_template")
+    Result<ServiceTemplateEntity> listAll();
+
+    @Query(
+        "SELECT vsp_id, version, name, base_name ,content_data"
+                + " FROM vsp_service_template where vsp_id=? and version=?")
+    Result<ServiceTemplateEntity> list(String vspId, Version version);
+
+
+    @Query(
+        "SELECT vsp_id, version, name, base_name ,content_data "
+                + "FROM vsp_service_template where vsp_id=? and version=? and name=?")
+    Result<ServiceTemplateEntity> getTemplateInfo(String vspId, UDTValue version, String name);
+
+    @Query(
+        "SELECT vsp_id, version, name, base_name  "
+                + "FROM vsp_service_template where vsp_id=? and version=?")
+    Result<ServiceTemplateEntity> getBase(String vspId, UDTValue version);
+  }
+
+
+}