This source repository contains the code for the core SDN Controller components.
To compile this code:
-1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories. See example-settings.xml for an example.
+1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the ONAP repositories and OpenDaylight repositories.
2. To compile, run "mvn clean install".
/restconf filters are enabled by specifying filter chain in
/opt/opendaylight/current/etc/org.opendaylight.aaa.filterchain.cfg
and enabling bundle class loading
- >bundle:dynamic-import org.openecomp.sdnc.filters-provider
+ >bundle:dynamic-import org.onap.ccsdk.sli.core.filters-provider
loggers:
- org.openecomp.sdnc.filters.audit
- org.openecomp.sdnc.filters.metric
- org.openecomp.sdnc.filters.request.response
+ org.onap.ccsdk.sli.core.filters.audit
+ org.onap.ccsdk.sli.core.filters.metric
+ org.onap.ccsdk.sli.core.filters.request.response
</pluginManagement>
</build>
<organization>
- <name>OpenECOMP</name>
+ <name>ONAP</name>
</organization>
<modules>
<module>provider</module>
* 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.
private static final Logger log = LoggerFactory.getLogger(LogFilter.class);
- private static final Logger AUDIT = LoggerFactory.getLogger("org.openecomp.sdnc.filters.audit");
+ private static final Logger AUDIT = LoggerFactory.getLogger("org.onap.ccsdk.sli.core.filters.audit");
@Override
public void destroy() {
}
* 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.
public class RequestResponseLoggingFilter implements Filter {
- private static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("org.openecomp.sdnc.filters.request.response");
+ private static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger("org.onap.ccsdk.sli.core.filters.request.response");
private static class ByteArrayServletStream extends ServletOutputStream {
<module>sliapi</module>
</modules>
<organization>
- <name>OpenECOMP</name>
+ <name>ONAP</name>
</organization>
<version>0.0.1-SNAPSHOT</version>
* 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.
.getLogger(SvcLogicDblibStore.class);
private static final String DBLIB_SERVICE =
- // "org.openecomp.sdnc.sli.resource.dblib.DBLibService";
- "org.openecomp.sdnc.sli.resource.dblib.DBResourceManager";
+ "org.onap.ccsdk.sli.core.dblib.DBResourceManager";
Properties props = null;
* 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.
private String dbUser = null;
private String dbPasswd = null;
private String dbDriver = null;
-
+
private Connection dbConn;
private PreparedStatement hasActiveGraphStmt = null;
private PreparedStatement hasVersionGraphStmt = null;
private PreparedStatement fetchVersionGraphStmt = null;
private PreparedStatement storeGraphStmt = null;
private PreparedStatement deleteGraphStmt = null;
-
+
private PreparedStatement deactivateStmt = null;
private PreparedStatement activateStmt = null;
-
+
private PreparedStatement registerNodeStmt = null;
private PreparedStatement unregisterNodeStmt = null;
private PreparedStatement validateNodeStmt = null;
-
+
private void getConnection() throws ConfigurationException
{
Properties jdbcProps = new Properties();
-
+
jdbcProps.setProperty("user", dbUser);
jdbcProps.setProperty("password", dbPasswd);
-
+
try {
Driver dvr = new com.mysql.jdbc.Driver();
if (dvr.acceptsURL(dbUrl))
}
-
-
+
+
try
{
this.dbConn = DriverManager.getConnection(dbUrl, jdbcProps);
catch (Exception e)
{
throw new ConfigurationException("failed to get database connection ["+dbUrl+"]", e);
- }
-
+ }
+
}
-
+
private void createTable() throws ConfigurationException
{
DatabaseMetaData dbm = null;
-
-
+
+
try {
dbm = dbConn.getMetaData();
} catch (SQLException e) {
{
throw new ConfigurationException("could not create SVC_LOGIC table", e);
}
-
+
// See if NODE_TYPES table exists and, if not, create it
-
+
try
{
throw new ConfigurationException("could not create SVC_LOGIC table", e);
}
}
-
+
private void prepStatements() throws ConfigurationException
{
// Prepare statements
String hasVersionGraphSql = "SELECT count(*) FROM "+dbName+".SVC_LOGIC"
+ " WHERE module = ? AND rpc = ? AND mode = ? AND version = ?";
-
+
try
{
hasVersionGraphStmt = dbConn.prepareStatement(hasVersionGraphSql);
catch (Exception e)
{
throw new ConfigurationException("could not prepare statement "+hasVersionGraphSql, e);
-
+
}
-
+
String hasActiveGraphSql = "SELECT count(*) FROM "+dbName+".SVC_LOGIC"
+ " WHERE module = ? AND rpc = ? AND mode = ? AND active = 'Y'";
-
+
try
{
hasActiveGraphStmt = dbConn.prepareStatement(hasActiveGraphSql);
catch (Exception e)
{
throw new ConfigurationException("could not prepare statement "+hasVersionGraphSql, e);
-
+
}
-
+
String fetchVersionGraphSql = "SELECT graph FROM "+dbName+".SVC_LOGIC"
+ " WHERE module = ? AND rpc = ? AND mode = ? AND version = ?";
-
+
try
{
fetchVersionGraphStmt = dbConn.prepareStatement(fetchVersionGraphSql);
catch (Exception e)
{
throw new ConfigurationException("could not prepare statement "+fetchVersionGraphSql, e);
-
+
}
-
+
String fetchActiveGraphSql = "SELECT graph FROM "+dbName+".SVC_LOGIC"
+ " WHERE module = ? AND rpc = ? AND mode = ? AND active = 'Y'";
-
+
try
{
fetchActiveGraphStmt = dbConn.prepareStatement(fetchActiveGraphSql);
catch (Exception e)
{
throw new ConfigurationException("could not prepare statement "+fetchVersionGraphSql, e);
-
+
}
-
+
String storeGraphSql = "INSERT INTO "+dbName+".SVC_LOGIC (module, rpc, version, mode, active, graph)"
+ " VALUES(?, ?, ?, ?, ?, ?)";
-
+
try
{
storeGraphStmt = dbConn.prepareStatement(storeGraphSql);
{
throw new ConfigurationException("could not prepare statement "+storeGraphSql, e);
}
-
+
String deleteGraphSql = "DELETE FROM "+dbName+".SVC_LOGIC WHERE module = ? AND rpc = ? AND version = ? AND mode = ?";
-
+
try
{
deleteGraphStmt = dbConn.prepareStatement(deleteGraphSql);
{
throw new ConfigurationException("could not prepare statement "+deleteGraphSql, e);
}
-
+
String deactivateSql = "UPDATE "+dbName+".SVC_LOGIC SET active = 'N' WHERE module = ? AND rpc = ? AND mode = ?";
-
+
try
{
deactivateStmt = dbConn.prepareStatement(deactivateSql);
{
throw new ConfigurationException("could not prepare statement "+deactivateSql, e);
}
-
+
String activateSql = "UPDATE "+dbName+".SVC_LOGIC SET active = 'Y' WHERE module = ? AND rpc = ? AND version = ? AND mode = ?";
-
+
try
{
activateStmt = dbConn.prepareStatement(activateSql);
{
throw new ConfigurationException("could not prepare statement "+activateSql, e);
}
-
+
String registerNodeSql = "INSERT INTO "+dbName+".NODE_TYPES (nodetype) VALUES(?)";
try
{
{
throw new ConfigurationException("could not prepare statement "+registerNodeSql, e);
}
-
+
String unregisterNodeSql = "DELETE FROM "+dbName+".NODE_TYPES WHERE nodetype = ?";
try
{
{
throw new ConfigurationException("could not prepare statement "+unregisterNodeSql, e);
}
-
+
String validateNodeSql = "SELECT count(*) FROM "+dbName+".NODE_TYPES WHERE nodetype = ?";
try
{
throw new ConfigurationException("could not prepare statement "+validateNodeSql, e);
}
}
-
+
private void initDbResources() throws ConfigurationException
{
if ((dbDriver != null) && (dbDriver.length() > 0))
{
-
+
try
{
Class.forName(dbDriver);
createTable();
prepStatements();
}
-
+
public void init(Properties props) throws ConfigurationException {
-
-
- dbUrl = props.getProperty("org.openecomp.sdnc.sli.jdbc.url");
+
+
+ dbUrl = props.getProperty("org.onap.ccsdk.sli.jdbc.url");
if ((dbUrl == null) || (dbUrl.length() == 0))
{
- throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.url unset");
+ throw new ConfigurationException("property org.onap.ccsdk.sli.jdbc.url unset");
}
-
- dbName = props.getProperty("org.openecomp.sdnc.sli.jdbc.database");
+
+ dbName = props.getProperty("org.onap.ccsdk.sli.jdbc.database");
if ((dbName == null) || (dbName.length() == 0))
{
- throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.database unset");
+ throw new ConfigurationException("property org.onap.ccsdk.sli.jdbc.database unset");
}
-
- dbUser = props.getProperty("org.openecomp.sdnc.sli.jdbc.user");
+
+ dbUser = props.getProperty("org.onap.ccsdk.sli.jdbc.user");
if ((dbUser == null) || (dbUser.length() == 0))
{
- throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.user unset");
+ throw new ConfigurationException("property org.onap.ccsdk.sli.jdbc.user unset");
}
-
- dbPasswd = props.getProperty("org.openecomp.sdnc.sli.jdbc.password");
+
+ dbPasswd = props.getProperty("org.onap.ccsdk.sli.jdbc.password");
if ((dbPasswd == null) || (dbPasswd.length() == 0))
{
- throw new ConfigurationException("property org.openecomp.sdnc.sli.jdbc.password unset");
+ throw new ConfigurationException("property org.onap.ccsdk.sli.jdbc.password unset");
}
-
- dbDriver = props.getProperty("org.openecomp.sdnc.sli.jdbc.driver");
-
+ dbDriver = props.getProperty("org.onap.ccsdk.sli.jdbc.driver");
+
+
initDbResources();
-
+
}
-
+
private boolean isDbConnValid()
{
boolean isValid = false;
-
+
try
{
if (dbConn != null)
}
catch (SQLException e)
{}
-
+
return(isValid);
}
public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException {
-
-
+
+
if (!isDbConnValid())
{
-
+
// Try reinitializing
initDbResources();
-
+
if (!isDbConnValid())
{
throw new ConfigurationException("no jdbc connection");
}
}
-
-
+
+
boolean retval = false;
ResultSet results = null;
-
+
PreparedStatement hasGraphStmt = null;
if (version == null)
{
{
hasGraphStmt = hasVersionGraphStmt;
}
-
-
+
+
try
{
hasGraphStmt.setString(1, module);
hasGraphStmt.setString(2, rpc);
hasGraphStmt.setString(3, mode);
-
+
if (version != null)
{
hasGraphStmt.setString(4, version);
results = hasGraphStmt.executeQuery();
dbConn.commit();
dbConn.setAutoCommit(oldAutoCommit);
-
+
if (results.next())
{
int cnt = results.getInt(1);
-
+
if (cnt > 0)
{
retval = true;
{
try
{
-
+
results.close();
}
catch (SQLException x)
{}
}
-
+
}
-
-
+
+
return(retval);
-
-
+
+
}
public SvcLogicGraph fetch(String module, String rpc, String version, String mode) throws SvcLogicException {
-
-
+
+
if (!isDbConnValid())
{
-
+
// Try reinitializing
initDbResources();
-
+
if (!isDbConnValid())
{
throw new ConfigurationException("no jdbc connection");
}
}
-
-
+
+
SvcLogicGraph retval = null;
ResultSet results = null;
-
+
PreparedStatement fetchGraphStmt = null;
if (version == null)
{
fetchGraphStmt.setString(2, rpc);
fetchGraphStmt.setString(3, mode);
-
+
if (version != null)
{
fetchGraphStmt.setString(4, version);
results = fetchGraphStmt.executeQuery();
dbConn.commit();
dbConn.setAutoCommit(oldAutoCommit);
-
+
if (results.next())
{
Blob graphBlob = results.getBlob("graph");
-
+
ObjectInputStream gStream = new ObjectInputStream(graphBlob.getBinaryStream());
-
+
Object graphObj = gStream.readObject();
gStream.close();
-
+
if (graphObj instanceof SvcLogicGraph)
{
retval = (SvcLogicGraph) graphObj;
else
{
throw new ConfigurationException("invalid type for graph ("+graphObj.getClass().getName());
-
+
}
-
+
}
else
{
catch (SQLException x)
{}
}
-
+
}
-
-
+
+
return(retval);
-
-
+
+
}
public void store(SvcLogicGraph graph) throws SvcLogicException {
-
-
+
+
if (!isDbConnValid())
{
-
+
// Try reinitializing
initDbResources();
-
+
if (!isDbConnValid())
{
throw new ConfigurationException("no jdbc connection");
{
throw new SvcLogicException("graph cannot be null");
}
-
+
byte[] graphBytes = null;
-
+
ByteArrayOutputStream byteStr = null;
ObjectOutputStream goutStr = null;
-
+
try
{
byteStr = new ByteArrayOutputStream();
goutStr = new ObjectOutputStream(byteStr);
goutStr.writeObject(graph);
-
+
graphBytes = byteStr.toByteArray();
-
+
}
catch (Exception e)
{
}
finally
{
-
+
if (goutStr != null)
{
try {
goutStr.close();
} catch (IOException e) {
-
+
}
}
-
+
if (byteStr != null)
{
try {
byteStr.close();
} catch (IOException e) {
-
+
}
}
}
-
-
+
+
// If object already stored in database, delete it
if (hasGraph(graph.getModule(), graph.getRpc(), graph.getVersion(), graph.getMode()))
{
delete(graph.getModule(), graph.getRpc(), graph.getVersion(), graph.getMode());
}
-
+
try
{
boolean oldAutoCommit = dbConn.getAutoCommit();
storeGraphStmt.setString(4, graph.getMode());
storeGraphStmt.setString(5, "N");
storeGraphStmt.setBlob(6, new ByteArrayInputStream(graphBytes));
-
+
storeGraphStmt.executeUpdate();
dbConn.commit();
-
+
dbConn.setAutoCommit(oldAutoCommit);
}
catch (Exception e)
{
throw new SvcLogicException("Could not write object to database", e);
- }
+ }
}
-
+
public void delete(String module, String rpc, String version, String mode) throws SvcLogicException
- {
+ {
if (!isDbConnValid())
{
-
+
// Try reinitializing
initDbResources();
-
+
if (!isDbConnValid())
{
throw new ConfigurationException("no jdbc connection");
deleteGraphStmt.setString(3, version);
deleteGraphStmt.setString(4, mode);
-
+
deleteGraphStmt.executeUpdate();
dbConn.commit();
dbConn.setAutoCommit(oldAutoCommit);
catch (Exception e)
{
throw new SvcLogicException("Could not delete object from database", e);
- }
+ }
}
public void activate(SvcLogicGraph graph) throws SvcLogicException
try
{
boolean oldAutoCommit = dbConn.getAutoCommit();
-
+
dbConn.setAutoCommit(false);
-
+
// Deactivate any current active version
deactivateStmt.setString(1, graph.getModule());
deactivateStmt.setString(2, graph.getRpc());
deactivateStmt.setString(3, graph.getMode());
deactivateStmt.executeUpdate();
-
+
// Activate this version
activateStmt.setString(1, graph.getModule());
activateStmt.setString(2, graph.getRpc());
activateStmt.setString(3, graph.getVersion());
activateStmt.setString(4, graph.getMode());
activateStmt.executeUpdate();
-
+
dbConn.commit();
-
+
dbConn.setAutoCommit(oldAutoCommit);
-
+
}
catch (Exception e)
{
@Override
public void registerNodeType(String nodeType) throws SvcLogicException {
-
+
if (isValidNodeType(nodeType))
{
return;
}
-
+
if (!isDbConnValid())
{
-
+
// Try reinitializing
initDbResources();
-
+
if (!isDbConnValid())
{
throw new ConfigurationException("no jdbc connection");
}
}
-
+
try
{
boolean oldAutoCommit = dbConn.getAutoCommit();
{
throw new SvcLogicException("Could not add node type to database", e);
}
-
+
}
@Override
public void unregisterNodeType(String nodeType) throws SvcLogicException {
-
+
if (!isValidNodeType(nodeType))
{
return;
}
-
+
if (!isDbConnValid())
{
-
+
// Try reinitializing
initDbResources();
-
+
if (!isDbConnValid())
{
throw new ConfigurationException("no jdbc connection");
}
}
-
+
try
{
boolean oldAutoCommit = dbConn.getAutoCommit();
{
throw new SvcLogicException("Could not delete node type from database", e);
}
-
+
}
@Override
public boolean isValidNodeType(String nodeType) throws SvcLogicException {
-
+
boolean isValid = false;
-
+
if (!isDbConnValid())
{
-
+
// Try reinitializing
initDbResources();
-
+
if (!isDbConnValid())
{
throw new ConfigurationException("no jdbc connection");
}
}
-
+
ResultSet results = null;
try
{
validateNodeStmt.setString(1, nodeType);
-
+
boolean oldAutoCommit = dbConn.getAutoCommit();
dbConn.setAutoCommit(false);
results = validateNodeStmt.executeQuery();
dbConn.commit();
dbConn.setAutoCommit(oldAutoCommit);
-
+
if (results != null)
{
if (results.next())
{
int cnt = results.getInt(1);
-
+
if (cnt > 0)
{
isValid = true;
}
}
}
-
+
}
catch (Exception e)
{
catch (SQLException x)
{}
}
-
+
}
-
+
return(isValid);
}
-
-
+
+
}
* 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.
private static final String SVC_LOGIC_STORE_ERROR = "Could not get service logic store";
private static final Logger LOGGER = LoggerFactory.getLogger(SvcLogicParser.class);
- private static final String SLI_VALIDATING_PARSER = "org.openecomp.sdnc.sli.parser.validate";
+ private static final String SLI_VALIDATING_PARSER = "org.onap.ccsdk.sli.parser.validate";
private static final String SVCLOGIC_XSD = "/svclogic.xsd";
private class SvcLogicHandler extends DefaultHandler {
* 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.
public class SvcLogicStoreFactory {
private static final Logger LOG = LoggerFactory.getLogger(SvcLogicStoreFactory.class);
-
+
public static SvcLogicStore getSvcLogicStore(String propfile)
throws SvcLogicException {
File propFile = new File(propfile);
public static SvcLogicStore getSvcLogicStore(InputStream inStr) throws SvcLogicException
{
Properties props = new Properties();
-
+
try {
props.load(inStr);
} catch (Exception e) {
throw new ConfigurationException("Could not get load properties from input stream", e);
}
-
+
return(getSvcLogicStore(props));
}
public static SvcLogicStore getSvcLogicStore(Properties props)
throws SvcLogicException {
- String storeType = props.getProperty("org.openecomp.sdnc.sli.dbtype");
+ String storeType = props.getProperty("org.onap.ccsdk.sli.dbtype");
if ((storeType == null) || (storeType.length() == 0)) {
throw new ConfigurationException(
- "property org.openecomp.sdnc.sli.dbtype unset");
+ "property org.onap.ccsdk.sli.dbtype unset");
}
SvcLogicStore retval = null;
- LOG.debug(String.format("Using org.openecomp.sdnc.sli.dbtype=%s", storeType));
+ LOG.debug(String.format("Using org.onap.ccsdk.sli.dbtype=%s", storeType));
if ("jdbc".equalsIgnoreCase(storeType)) {
retval = new SvcLogicJdbcStore();
}
-
+
retval.init(props);
return (retval);
}
<?xml version = "1.0" encoding = "UTF-8"?>\r
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.openecomp.org/sdnc/svclogic" xmlns="http://www.openecomp.org/sdnc/svclogic">\r
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onap.org/sdnc/svclogic" xmlns="http://www.onap.org/sdnc/svclogic">\r
\r
<xsd:simpleType name="modeType">\r
<xsd:restriction base="xsd:string">\r
-->
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+ xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd"
module="ase" version="1.0.0">
<method rpc="ase-evc-activation" mode="sync">
- <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+ <configure adaptor="org.onap.ccsdl.sli.adaptors.emt.EmtAdaptor"
key="$evc-name" activate="true">
<parameter name="circuit.name" value="$evc-name" />
<parameter name="topology" value="$topology" />
</method>
<method rpc="ase-evc-disconnect-request" mode="sync">
- <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+ <configure adaptor="org.onap.ccsdk.sli.adaptors.emt.EmtAdaptor"
key="$evc-name" activate="false">
<outcome value="success">
<return status="success" />
-->
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+ xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd"
module="ase" version="1.0.0">
<!-- Reserve a port. Returns uni-circuit-id of reserved ase-port -->
<method rpc="ase-port-reserve" mode="sync">
<switch test="$uni-cir-units">
<outcome value="Mbps">
- <reserve plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <reserve plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-port"
key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value"
pfx="asePort">
<outcome value="success">
<block>
- <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
<parameter name="file" value="/tmp/sample_r1.log" />
<parameter name="field1" value="__TIMESTAMP__"/>
<parameter name="field2" value="RESERVED"/>
</reserve>
</outcome>
<outcome value="Gbps">
- <reserve plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <reserve plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-port"
key="resource-emt-clli == $edge-device-clli and speed >= 1000 * $uni-cir-value"
pfx="asePort">
<outcome value="success">
<block>
- <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
<parameter name="file" value="/tmp/sample_r1.log" />
<parameter name="field1" value="__TIMESTAMP__"/>
<parameter name="field2" value="RESERVED"/>
then configures it on device -->
<method rpc="ase-port-activate-request" mode="sync">
- <allocate plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <allocate plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-port" key="uni-circuit-id == $uni-circuit-id" pfx="asePort">
<outcome value="success">
- <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+ <configure adaptor="org.onap.ccsdk.sli.adaptors.emt.EmtAdaptor"
key="$uni-circuit-id" activate="true">
<parameter name="circuit.id" value="$uni-circuit-id" />
<parameter name="subscriber.name" value="$subscriber-name" />
<parameter name="mtu" value="$asePort.resource-mtu" />
<outcome value="success">
<block>
- <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
<parameter name="file" value="/tmp/sample_r1.log" />
<parameter name="field1" value="__TIMESTAMP__"/>
<parameter name="field2" value="ACTIVE"/>
<!-- Change provisioning w/o activation -->
<method rpc="ase-change-port-prov-request" mode="sync">
- <allocate plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <allocate plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-port" key="uni-circuit-id == $uni-circuit-id" pfx="asePort">
<outcome value="success">
<!-- Release port -->
<method rpc="ase-release-port-request" mode="sync">
- <exists plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <exists plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-evc" key="uni-circuit-id == $uni-circuit-id">
<outcome value="true">
</return>
</outcome>
<outcome value="false">
- <release plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <release plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-port" key="uni-circuit-id == $uni-circuit-id">
<outcome value="success">
<block>
- <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
<parameter name="file" value="/tmp/sample_r1.log" />
<parameter name="field1" value="__TIMESTAMP__"/>
<parameter name="field2" value="RELEASED"/>
-->
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+ xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd"
module="ase" version="1.0.1">
<!-- Updated release port logic : deactivate the released port on the EMT -->
<method rpc="ase-release-port-request" mode="sync">
- <exists plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <exists plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-evc" key="uni-circuit-id == $uni-circuit-id">
<outcome value="true">
</return>
</outcome>
<outcome value="false">
- <release plugin="org.openecomp.sdnc.sli.resource.sample.SampleResource"
+ <release plugin="org.onap.ccsdk.sli.adaptors.sample.SampleResource"
resource="ase-port" key="uni-circuit-id == $uni-circuit-id">
<outcome value="success">
- <configure adaptor="org.openecomp.sdnc.sli.adaptor.emt.EmtAdaptor"
+ <configure adaptor="org.onap.ccsdk.sli.adaptors.emt.EmtAdaptor"
key="$uni-circuit-id" activate="false">
<outcome value="success">
<block>
- <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
<parameter name="file" value="/tmp/sample_r1.log" />
<parameter name="field1" value="__TIMESTAMP__" />
<parameter name="field2" value="RELEASED" />
-->
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+ xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd"
module="neutron" version="1.0.0">
<method rpc="canCreateNetwork" mode="sync">
============LICENSE_END=========================================================
-->
-<multicast-parameters xmlns="org.openecomp.sdnc:test">
+<multicast-parameters xmlns="org.onap.sdnc:test">
<vpn-v4-multicast-enabled>Y</vpn-v4-multicast-enabled>
<v4-multicast>
<v4-pim-ssm-default-range>Y</v4-pim-ssm-default-range>
-->
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+ xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd"
module="neutron" version="1.0.0">
<method rpc="canCreateNetwork" mode="sync">
# 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.
###
org.slf4j.simpleLogger.defaultLogLevel=info
-org.slf4j.simplelogger.log.org.openecomp.sdnc.sli.SvcLogicContext=debug
+org.slf4j.simplelogger.log.org.onap.ccsdk.sli.core.sli.SvcLogicContext=debug
org.slf4j.simplelogger.log.SvcLogicContext=debug
# 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.
# ============LICENSE_END=========================================================
###
-org.openecomp.sdnc.sli.dbtype = jdbc
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://localhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database = sdnctl
-org.openecomp.sdnc.sli.jdbc.user = sdnctl
-org.openecomp.sdnc.sli.jdbc.password = gamma
+org.onap.ccsdk.sli.dbtype = jdbc
+org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://localhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.database = sdnctl
+org.onap.ccsdk.sli.jdbc.user = sdnctl
+org.onap.ccsdk.sli.jdbc.password = gamma
# 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.
echo SLI_COMMON_JAR is $SLI_COMMON_JAR
-java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER}:${SLI_COMMON_JAR} org.openecomp.sdnc.sli.SvcLogicParser $*
+java -cp ${CLASSPATH}:${MYSQL_JDBC_DRIVER}:${SLI_COMMON_JAR} org.onap.ccsdk.sli.core.sli.SvcLogicParser $*
<?xml version = "1.0" encoding = "UTF-8"?>\r
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.openecomp.org/sdnc/svclogic" xmlns="http://www.openecomp.org/sdnc/svclogic">\r
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onap.org/sdnc/svclogic" xmlns="http://www.onap.org/sdnc/svclogic">\r
\r
<xsd:simpleType name="modeType">\r
<xsd:restriction base="xsd:string">\r
<Export-Package>org.onap.ccsdk.sli.core.sli.provider;version=${project.version}</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
- <!--
- <Import-Package>org.openecomp.sdnc.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.vim25.*,org.apache.xerces.*,com.mysql.jdbc.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*</Import-Package>
- -->
+
<Import-Package>org.onap.ccsdk.sli.core.sli;version="${project.version}",*</Import-Package>
- <!--
- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|jcl-over-slf4j|xml-apis|mysql-connector-java</Embed-Dependency>
- -->
+
<Embed-Dependency>*;scope=compile;artifactId=commons-lang|commons-lang3</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
* 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.
import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
public interface SvcLogicService {
-
- public static final String NAME = "org.openecomp.sdnc.sli.provider.SvcLogicService";
-
+
+ public static final String NAME = "org.onap.ccsdk.sli.core.sli.provider.SvcLogicService";
+
// public SvcLogicContext execute(SvcLogicGraph graph, SvcLogicContext ctx) throws SvcLogicException;
/**
* Check for existence of a directed graph
* @throws SvcLogicException
*/
public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException;
-
+
/**
* Execute a directed graph
- *
+ *
* @param module - module name
* @param rpc - rpc name
* @param version - version. If null, use active version
* @param parms - parameters, used to set SvcLogicContext attributes
* @return final values of attributes from SvcLogicContext, as Properties
* @throws SvcLogicException
- *
- *
+ *
+ *
* @deprecated use execute(String module, String rpc, String version, String mode, DOMDataBroker dataBroker) instead
*/
@Deprecated
public Properties execute(String module, String rpc, String version, String mode, Properties parms) throws SvcLogicException;
-
+
/**
* Execute a directed graph
- *
+ *
* @param module - module name
* @param rpc - rpc name
* @param version - version. If null, use active version
* @throws SvcLogicException
*/
public Properties execute(String module, String rpc, String version, String mode, Properties parms, DOMDataBroker domDataBroker) throws SvcLogicException;
-
+
}
-->
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
+<service-logic xmlns="http://www.onap.org/sdnc/svclogic"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd"
+ xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd"
module="neutron" version="1.0.0">
<method rpc="canCreateNetwork" mode="sync">
# 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.
# ============LICENSE_END=========================================================
###
-org.openecomp.sdnc.sli.dbtype = jdbc
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://localhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database = sdnctl
-org.openecomp.sdnc.sli.jdbc.user = sdnctl
-org.openecomp.sdnc.sli.jdbc.password = gamma
+org.onap.ccsdk.sli.dbtype = jdbc
+org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://localhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.database = sdnctl
+org.onap.ccsdk.sli.jdbc.user = sdnctl
+org.onap.ccsdk.sli.jdbc.password = gamma
# 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.
# ============LICENSE_END=========================================================
###
-org.openecomp.sdnc.sli.dbtype = jdbc
-org.openecomp.sdnc.sli.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.database = sdnctl
-org.openecomp.sdnc.sli.jdbc.user = sdnctl
-org.openecomp.sdnc.sli.jdbc.password = gamma
+org.onap.ccsdk.sli.dbtype = jdbc
+org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://dbhost:3306/sdnctl
+org.onap.ccsdk.sli.jdbc.database = sdnctl
+org.onap.ccsdk.sli.jdbc.user = sdnctl
+org.onap.ccsdk.sli.jdbc.password = gamma
import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; }
- organization "openECOMP";
+ organization "ONAP";
contact
"Dan Timoney";
* 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.
protected BindingAwareBroker.RpcRegistration<SLIAPIService> rpcRegistration;
- private static String SLIAPI_NAMESPACE = "org:openecomp:sdnc:sliapi";
+ private static String SLIAPI_NAMESPACE = "org:onap:ccsdk:sli:core:sliapi";
private static String SLIAPI_REVISION = "2016-11-10";
private static QName TEST_RESULTS_QNAME = null;
<!-- This xmlns:prefix should match the namespace in the *-provider-impl.yang file
The prefix: inside type should match the prefix of the yang file. -->
- <type xmlns:prefix="org:openecomp:sdnc:sliapi:provider:impl">
+ <type xmlns:prefix="org:onap:ccsdk:sli:core:sliapi:provider:impl">
prefix:sliapi-provider-impl
</type>
<name>sliapi-provider-impl</name>
Code Review / ccsdk / sli.git / commitdiff