From b2175581c55981e2eb039f3543baffe76d13394d Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 31 Mar 2017 17:47:19 -0400 Subject: [SDNC-5] Rebase sdnc-oam Port to OpenDaylight Boron and sync updates since 16.10 Change-Id: I9f6febe0bd3d50c3d27c775e5a41806ee3d2e6cb Signed-off-by: Dan Timoney Former-commit-id: c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b --- dgbuilder/nodes/dge/dgelogic/block.html | 2 +- dgbuilder/nodes/dge/dgelogic/configure.html | 2 +- dgbuilder/nodes/dge/dgelogic/delete.html | 2 +- dgbuilder/nodes/dge/dgelogic/exists.html | 2 +- dgbuilder/nodes/dge/dgelogic/get-resource.html | 2 +- dgbuilder/nodes/dge/dgelogic/is-available.html | 2 +- dgbuilder/nodes/dge/dgelogic/notify.html | 2 +- dgbuilder/nodes/dge/dgelogic/record.html | 2 +- dgbuilder/nodes/dge/dgelogic/release.html | 2 +- dgbuilder/nodes/dge/dgelogic/reserve.html | 2 +- dgbuilder/nodes/dge/dgelogic/save.html | 2 +- dgbuilder/nodes/dge/dgelogic/switchNode.html | 4 ++-- dgbuilder/nodes/dge/dgelogic/update.html | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'dgbuilder/nodes/dge/dgelogic') diff --git a/dgbuilder/nodes/dge/dgelogic/block.html b/dgbuilder/nodes/dge/dgelogic/block.html index 29c85ac0..9dc116ee 100644 --- a/dgbuilder/nodes/dge/dgelogic/block.html +++ b/dgbuilder/nodes/dge/dgelogic/block.html @@ -75,7 +75,7 @@ 
<block>
   <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
-    <parameter name="file" value="/tmp/gamma_r1.log" />
+    <parameter name="file" value="/tmp/sample_r1.log" />
     <parameter name="field1" value="__TIMESTAMP__"/>
     <parameter name="field2" value="RESERVED"/>
     <parameter name="field3" value="$asePort.uni_circuit_id"/>
diff --git a/dgbuilder/nodes/dge/dgelogic/configure.html b/dgbuilder/nodes/dge/dgelogic/configure.html
index f1afc8d4..232d22e3 100644
--- a/dgbuilder/nodes/dge/dgelogic/configure.html
+++ b/dgbuilder/nodes/dge/dgelogic/configure.html
@@ -99,7 +99,7 @@
   <outcome value="success">
     <block>
       <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
-        <parameter name="file" value="/tmp/gamma_r1.log" />
+        <parameter name="file" value="/tmp/sampler1.log" />
         <parameter name="field1" value="__TIMESTAMP__"/>
         <parameter name="field2" value="ACTIVE"/>
         <parameter name="field3" value="$uni-circuit-id"/>
diff --git a/dgbuilder/nodes/dge/dgelogic/delete.html b/dgbuilder/nodes/dge/dgelogic/delete.html
index 4a011e6e..0fbb0022 100644
--- a/dgbuilder/nodes/dge/dgelogic/delete.html
+++ b/dgbuilder/nodes/dge/dgelogic/delete.html
@@ -71,7 +71,7 @@
 

 
Example

 

-
<delete plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<delete plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
         resource="ase-port"
         key="uni_circuit_id == $uni-circuit-id">
   <outcome value="true">
diff --git a/dgbuilder/nodes/dge/dgelogic/exists.html b/dgbuilder/nodes/dge/dgelogic/exists.html
index 652495e0..0ccc43a9 100644
--- a/dgbuilder/nodes/dge/dgelogic/exists.html
+++ b/dgbuilder/nodes/dge/dgelogic/exists.html
@@ -71,7 +71,7 @@
 

 
Example

 

-
<exists plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<exists plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
         resource="ase-port"
         key="uni_circuit_id == $uni-circuit-id">
   <outcome value="true">
diff --git a/dgbuilder/nodes/dge/dgelogic/get-resource.html b/dgbuilder/nodes/dge/dgelogic/get-resource.html
index 4e1b1a98..ecd58192 100644
--- a/dgbuilder/nodes/dge/dgelogic/get-resource.html
+++ b/dgbuilder/nodes/dge/dgelogic/get-resource.html
@@ -74,7 +74,7 @@
 

 
Example

 

-
<get-resource plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<get-resource plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
               resource="ase-port"
               key="uni_circuit_id == $uni-circuit-id">
   <outcome value="success">
diff --git a/dgbuilder/nodes/dge/dgelogic/is-available.html b/dgbuilder/nodes/dge/dgelogic/is-available.html
index 4bc22365..dc27e048 100644
--- a/dgbuilder/nodes/dge/dgelogic/is-available.html
+++ b/dgbuilder/nodes/dge/dgelogic/is-available.html
@@ -71,7 +71,7 @@
 

 
Example

 

-
<is-available plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<is-available plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
               resource="ase-port"
               key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value">
   <outcome value="true">
diff --git a/dgbuilder/nodes/dge/dgelogic/notify.html b/dgbuilder/nodes/dge/dgelogic/notify.html
index 78820482..157a133d 100644
--- a/dgbuilder/nodes/dge/dgelogic/notify.html
+++ b/dgbuilder/nodes/dge/dgelogic/notify.html
@@ -71,7 +71,7 @@
 

 
Example

 

-
<notify plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<notify plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
             resource="network-connection" action="DELETE" >
   <parameter name="message" value="Hello, world!" />
   <outcome value="success">
diff --git a/dgbuilder/nodes/dge/dgelogic/record.html b/dgbuilder/nodes/dge/dgelogic/record.html
index 654b88dc..310ebac0 100644
--- a/dgbuilder/nodes/dge/dgelogic/record.html
+++ b/dgbuilder/nodes/dge/dgelogic/record.html
@@ -75,7 +75,7 @@
 
Example

 

 
<record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
-  <parameter name="file" value="/tmp/gamma_r1.log" />
+  <parameter name="file" value="/tmp/sample_r1.log" />
   <parameter name="field1" value="__TIMESTAMP__"/>
   <parameter name="field2" value="ACTIVE"/>
   <parameter name="field3" value="$uni-circuit-id"/>
diff --git a/dgbuilder/nodes/dge/dgelogic/release.html b/dgbuilder/nodes/dge/dgelogic/release.html
index 39c88399..c68a2f72 100644
--- a/dgbuilder/nodes/dge/dgelogic/release.html
+++ b/dgbuilder/nodes/dge/dgelogic/release.html
@@ -74,7 +74,7 @@
 

 
Example

 

-
<release plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<release plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
          resource="ase-port"
          key="uni_circuit_id == $uni-circuit-id">
   <outcome value="success">
diff --git a/dgbuilder/nodes/dge/dgelogic/reserve.html b/dgbuilder/nodes/dge/dgelogic/reserve.html
index c2e4a10f..a6a799a2 100644
--- a/dgbuilder/nodes/dge/dgelogic/reserve.html
+++ b/dgbuilder/nodes/dge/dgelogic/reserve.html
@@ -74,7 +74,7 @@
 

 
Example

 

-
<reserve plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<reserve plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
          resource="ase-port"
          key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value"
          select="min(speed)">
diff --git a/dgbuilder/nodes/dge/dgelogic/save.html b/dgbuilder/nodes/dge/dgelogic/save.html
index 56bfa49e..923698ae 100644
--- a/dgbuilder/nodes/dge/dgelogic/save.html
+++ b/dgbuilder/nodes/dge/dgelogic/save.html
@@ -77,7 +77,7 @@
 

 
Example

 

-
<save plugin="`$gamma-resource-plugin`" resource="resourceName"
+
<save plugin="`$resource-plugin`" resource="resourceName"
         key="keyName=value"
         pfx="requests.resourceName">
         <parameter name="parameter1"
diff --git a/dgbuilder/nodes/dge/dgelogic/switchNode.html b/dgbuilder/nodes/dge/dgelogic/switchNode.html
index 61c71098..ad2077b1 100644
--- a/dgbuilder/nodes/dge/dgelogic/switchNode.html
+++ b/dgbuilder/nodes/dge/dgelogic/switchNode.html
@@ -61,7 +61,7 @@
 

 
<switch test="$uni-cir-units">
   <outcome value="Mbps">
-    <reserve plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+    <reserve plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
                          resource="ase-port"
                          key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value"
                          pfx="asePort">
@@ -80,7 +80,7 @@
     </reserve>
   </outcome>
   <outcome value="Gbps">
-    <reserve plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+    <reserve plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
                          resource="ase-port"
                          key="resource-emt-clli == $edge-device-clli and speed >= $uni-cir-value*1000"
                          pfx="asePort">
diff --git a/dgbuilder/nodes/dge/dgelogic/update.html b/dgbuilder/nodes/dge/dgelogic/update.html
index b268f7a4..e728a409 100644
--- a/dgbuilder/nodes/dge/dgelogic/update.html
+++ b/dgbuilder/nodes/dge/dgelogic/update.html
@@ -71,7 +71,7 @@
 

 
Example

 

-
<update plugin="org.openecomp.sdnc.sli.resource.gamma.GammaResource"
+
<update plugin="org.openecomp.sdnc.sli.resource.samplesvc.SampleServiceResource"
             resource="network-connection" action="DELETE" >
   <parameter name="message" value="Hello, world!" />
   <outcome value="success">
-- 
cgit