perfsonar-dev - perfsonar: r5256 - in branches/perfsonarui: ant jars/ls src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/lsplayground src/org/perfsonar/perfsonarui/ma src/org/perfsonar/perfsonarui/plugins src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui
Subject: perfsonar development work
List archive
perfsonar: r5256 - in branches/perfsonarui: ant jars/ls src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/lsplayground src/org/perfsonar/perfsonarui/ma src/org/perfsonar/perfsonarui/plugins src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5256 - in branches/perfsonarui: ant jars/ls src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/lsplayground src/org/perfsonar/perfsonarui/ma src/org/perfsonar/perfsonarui/plugins src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui
- Date: Fri, 7 Aug 2009 13:51:42 -0400
Author: nina
Date: 2009-08-07 13:51:41 -0400 (Fri, 07 Aug 2009)
New Revision: 5256
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/LSPlaygroundMainPanel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/LSPlaygroundModel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/MANIFEST.MFT
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/TopoElementLookupAction.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/TopoElementPanel.java
branches/perfsonarui/src/plugins.lsplayground.classes
Modified:
branches/perfsonarui/ant/build.xml
branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar
branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/Lookup.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserData.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/TracerouteTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
Log:
initial implementation of a new plugin for Lookup Service testing
Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml 2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/ant/build.xml 2009-08-07 17:51:41 UTC (rev 5256)
@@ -22,7 +22,7 @@
-->
<project basedir="../" default="all" name="perfsonar">
- <property name="version" value="0.15a" />
+ <property name="version" value="0.15b" />
<!-- compile options -->
<property name="build.sysclasspath" value="ignore" />
<property name="build.compiler" value="modern" />
@@ -189,6 +189,15 @@
</fileset>
</jar>
+ <!-- playground -->
+ <jar jarfile="${appdist.dir}/bin/ext/plugins-lsplayground.jar"
compress="true"
+
manifest="${src}/org/perfsonar/perfsonarui/lsplayground/MANIFEST.MFT" >
+
+ <fileset dir="${build}">
+ <includesfile name="${src}/plugins.lsplayground.classes" />
+ </fileset>
+ </jar>
+
<!-- flow selection and aggregation MA client -->
<jar jarfile="${appdist.dir}/bin/ext/plugins-flowsa.jar"
compress="true"
manifest="${src}/org/perfsonar/perfsonarui/flowsa/MANIFEST_FLOWSA_plugin.MFT"
>
Modified: branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar
===================================================================
--- branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar 2009-08-07
16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar 2009-08-07
17:51:41 UTC (rev 5256)
@@ -1,113 +1,112 @@
PK
-
-
-
-
-
-
-
-
+
+
+�;e{��e
+
+
+
+
+
+
`(D��p�]���y�
-
+
�0��kmkq�G���쬓�P�k-!-iZ��|
-
+
#�.Yg�<�q166�3��2���`�I�Q�q��0��nTvԅ���"ޗ��B���nM�ݚ��Eń�^�[['l�"�e_%����fsm��FTMZ��Ȥ��p���J�\.%��9����@��
��|�
�K�PK
-
-r<���
��U_�Z��R���e%24�XX1��џ;��'��5ߤ6��*"|#���3���E}����Le��"}�Wb(a
-�˴�j��\��6��i-�,�����t�
PK
-
+
+
��k�Hd��5�ߟ��t��Q�A�!�EK�v{g�>���Ij��m�����
ƪB0(��84^���<w^���m�*��֥5��~9��+�-"nX�Ɨ�66�^�S�F����F��������q�0���\i����2�B�v�GxB/�~t
Ҩ�N=�
-
-
+
+
�0�Wk��\xE��ڵ�
~�3�Ĥ�Q�j.<��S��b�ü?��9�9�=B�%wk�p<�T���J��,����BV����jg�~,�\ņY[&L��\��4�*Ϧ)LS>���oO~FY��S%E��-(%t��
�� �/PK
-
+
_��'뒽�q�"�p�o6��?�a�psj�p��_�@h�h��R���ER���R������PK
-
+
]�2DDŽ����ܺR4���+��b-��1T�ɠ[έ}���r�_t���K�
� ����0IYO���mM8�63�.�m���\N�qa�S�Ld�ѕ�ʶ잋��i�
����-��G�f�a�B]�) o%��0�
�@�#��,}�s3�
-
+
�Ҹ/y+�K��6uCZR̤m���V�H��)?����~h3�3�~����~i�w6��ⴣ������s;�{����
��i���}��-,|�m�����aDs�yPw�v��f�u#j�؈bH�zJ��7K�O�/��%��ԩS��
������οz�d�[i�4x�)��z��h��V�@UN�y�q:5�L]���#���!y戁��Ֆ}�!w�d+�����#�2�[àIH��:^t�%H�✶�S�
=�l��3?i���;LWp.�w 㤍w��6�ZR���ޡ5�d
����ߐ�jd�)��1]�6����}�hB�r�}�ߡ��A�?0T4s�>�
�#�3��a؇��?��,g�H�I�m��DS���"��BAsܦ����]��c��H���۴�K�ZI�IJh�
II�\�$�\��R�IZ�&K'r�i�"��H�W�U�F~3Z�}PK
-
+
�yOú\sSߒ�m
E
�k��!b����K�W7�����:�g�~ն�#��ZP��[t-1�<w���6�L���X"�PMx�`�m�P��q��������.���]�F�%�j�ۦg�~{0$��`���m���]_xfU���U��E��Ȏ`�'K͖i4�ee.r�����
�5�=^r�/��e*Q[>�S����
�3��j��#9XS
]1���)\��F���ȉ/z�E��s���>��2�%�N0������M�O�jJ����^�+}s�r�]ۭ�q���ˍA��V��
�vR��A�����8�
n�MO����)���ѲUwLAS$Ϧ����j�_T"F�Nn:a��9���iO���V]"�
���Bf�j��6�*�iɓ{����I�:&Q����aC�&.S�z���7(��;:>�] ����-
���}c�ai���*:>��:>C�av�z�0��ڦS7��>�U�]s�.���C0)��w�ܚ�W��h���
�������"u�E��jWk���Գ�x��(��0�M��P��?Gu&��t%/oy��w��;�\c����;��1k�5�fHt��k�D��yNf������ѣh��-iwҫiBnP�i|�S��vhE��c��`��G�g!�=
��6��/S{ ������i��
/��%�0e�@�/���
�."����@pzf������I��?�1�lX�F覊$"�e�IiE~A,�%��ABS.�0q.�����["���MR��
�Q�N4_�*�t�Ҋ�=��J+�Ќ�
\�+D��uR��UL�T*�e�R��u���s�<N�W��$+L^�%S"��t9�A�v�s�0�������R��+U��-�E�f��Z��j�
R--�b�TK�� IJ���PK
-
-S�G,oո/��Z����I��8{�'�Nٲ[sm��5F�(P�˝8��A�L�;1��c���A��}�Qtǟ��t*��g
-k��E�GE[��W���Wѥu�����WK�X�
�Dw�`��?����G�����%�.L)R���;\�j�a'��Ȗ�j�|.�����
���oܘ�i�{�+vu&;����t�W5�K<�}az">v�tz����\�\�Oh�Ex�����O?���x�|���m(i����$��?1jੲx~͒����w�Q�U���xǓ�Z�I��1(�x3
�0��}\�1.�$>�1��:N��$Vu�H��b0:|
0��{+��z�W�u��m<6l��Ό�R�pv���m��iOy�@��Ni���>��}
��z�e@�C��>j)CD_�/�ZFm���`��Ӆ�(�
%��
-�1@�dfUK�T-���Lf����9$�G�C?�kxd�~l��U�O�z�o�;�3J��,�&�w�E��]����5�0�ch�9G��(������Q��������T�D]��*�P����0F����ץz��K�HR�B�����H���E��J�
-\B�$8�\F�����Zc���w���?n������M��N+p���£XJ�樝W�B�\�fT&ӈׂ�\�^�c���ղjR�U��A���j�uU3Mҙ'�qZқ�}�e|����
-
+
+�1tOZ�%�
�\~�A�v�9C�l9�Z��Ľsɦ���[5�Eӳ�w4���g(�]�fԹ���:�g�~ն�#�nӨoL-��3���O+�CO��2_��i��\���PdSo�$bVy����
+m
��n`�q��y��̀{���l���keg��Qvݯ�z�{k�(�5�L�6��Q���&�����N=4��Ur�k7*2
u��r|��Q&��#C�t����r?��S���Pٌ�Wݵ0�:�e�������p��YJ�a�r$�P̅.a�F�������d��|�"�e�d�)�XX�s_�
���Ƣ�,nW�l;enݵ��z)�>Q$o�;1P�D�T�;Q�+�T��c��� ��=]{
a�����Nb��La���h��h���*W���vi�9��D�����SVe�,Sŝۛo�
+���,���7}*u�y�S�T����/W��i���'�����~����{��vP���ܘ�i�{�+�d&;������/v�W�ԗx����D|�0���8i�16y�s)T��v��y���Oe�VQ�y�����6���P6w<�O̅
+<]q��/Y�Vtp�]|TZ�q
+��]�� z�eA�C��^�)CԾL_g�g�w
����^�6M=p�� Qz(�~4MfW��S�S���d�IS��$�Hs�g$��7�L���~��WP���r�mE�
��qo��[J#�Sx��Z�К}\��G.����)�S�F��1MNy��@��\$\�)��`��CV�^��P�(QI1$)u:�*�Rc�=�B9K\Z-��)
]�g#@��
��� �Q�Ά�1�,��y��*p E�(H����pYnS�K��T�=�6�ܾfp�?n������E���(p�I�A
,�wA}�����1�
�*�F���E�BW�E{X˪I7W�wT��U�tC�����2�(@z3��k_"��6�z���\}H�YE]�PK
+
q<��� ����|����s���/��X)��Eo��Y�%�W��F��'��Z���``G
�}�����x���cv��n�������(���:#U��O����k~���F����/�TW*q����3�鮎�vN(��JZ���6�h
̥Պ�(�q"�rQ'$"��;�|�ݡ����M,��fSa-���R�P�yf�pv�`���ͯ1�����S��XJ���;
�<����x��f�a���eX|u�)'S�t�o(�?u!@H�e�D�bR@�J���a��yv�7}"[&
hd���aj���D�i��G�1K��a�(��A�u����
I���ư�����57�Uxɪ�������|f�PK
-
-
-���M���+\j�!4���BXL�D�YǗ=rM a_��0
�"����0�q�yf2�e������q��Z-�
-
+
+
+>�7�4����Q
+�j����������
+
�0D�Wmԕ�p�Е�����--�G�X<������3��y��� ��B�TP
s���o���sLX7<����uK:H�p1�w��;/UoC����k�����������H����m"T��J�Ȟ`a����PK
-
+
���tI�ɒ�.��<�
�V�vQ=R$��.,?I0������ն�}9��h�vN�`�H�8�.J��_�{�T�3�3/9R��ZE�����X�7l��j���
�5i����{��q!�wsZr��ذ�����G8���qK0N~���a�F�PK
-
+
�0D�Wmԕ�p۠
B��'��[Z$�x6�C��f63�^���
3�RA)L
������1aYs�n]ǭkY�A�����'��z�:��ƇF_s���]�߽�u',�vF}<wl��VE����&PK
-
+
�0E�Tm�Z�ޠ�^A��'�aZZB*I��\x
-
+
�:��A!�A�$0����4��j���z7���F�����Ð�n��k�B��kVC����r�rۑ�UV9X
�g��%��/2djB-u=g���[���t�,]�ܬ� ��9�(IW��h��ʐ-{6wV�/�����
0�(;0����)k�Ѷ-Jz.����
G��ȵ�a:_��[�r�[���>�ӵMa�@q�ỻ�
�q�P�y����4'm!���|3T#UBr��ca~��Qz���O�?��
o�&!��nɗ�T�o������J��t�(��3�a:�i��S�8%�
k�x�����B�6E��!�i*�R�P�:�2{ȼl������(���5�PK
-
-
+
+
*
�
b��!!��0�4dP2��X��8�
-
-
-
-
-
-H�E��)`��LG"�R�.��wDR2e���h��g�����Uԁ�\���i��G
2�sQ^�o�|�����Y�(���D�-��|mLsNH�:
kX��D��|�tMΒf��X��������c���:.�S���j��5��І�
�0�ϵ�^Ɍ��r�1�������"��|Ng'i-s������O�D�>��m�1�
�BK�TJZ�2�`�A�jgab����C ��Y�M�a'�M���5DWR>����
"�,���1%�]��P|��w˔t;����S�LQ뛔Lu3��Q0��qb�/��������X�$mUE���O���VLG��P�C�Dom��b/!Ȝ�<[3��{��+�Q��hK_;s��hM��N��V,�ӭʼn����C
-��iJF��p�xu���0�s9
-ƞY80�q�+�\�Ʀ�LQ���yE7r�iH2h�n15�1�}�m���7�"�̸�RYU��'�@�D�y�'�h�Z�]�@�-
-&�НH�0��F� �-A
��������2On6ه���
-��
-St����L�
�@��fR�l���c�T�*�G��S��-����Z��o�0�q:��G����?PK
-
-�0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-*
�
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+?
?'���b�К���L�ꌐ�.�G���"!����
9�F6��<[)�Z/��hy��ƣ�1���z��%
W����#t8SN{-R��woY8E�8}=���ʆ��(.E�uʉ��IO�6S)L�-K*���ʘ4*<�R�����I�
�i�b�9A;�B�He2��"�qZB�0��Z�S)��BP.���ę���_��r��'C�*��_@e��~�I_7@+��r�qt�����6�~{q��tY$��jӏ8���S
G��P��
+���EiE+!�,)Y:�PD�W�9���Cw�M}��7�������9�x����p��f%l�$<�I+�#�0V����
Y���H&��W��=^I/�Wxx��9d;��.7k��"~�Ln`K��>�AIyT�
���p���P�ҿs&��`b�(+���ʳ��RH+]b�|���d'Nג=-|!u���-��M�L�N:
�8���+#�d����G�(�'��b<��g邐~�����h1�=$�R��f�&���SSh�hi
+k�ڏ�:��&�=��W4�ƠU$�g����k�7o�6`G�����v0�:�9]P$�'����������5**�\t�Ν�N�t��}����5���
a<mj�U��8
���L�QuA��]�v_w��K=ѠЫ��}�#:x�ܱ6�[=�V�n��������Fl]4:傫��8��d������`g��:܆#�@�i��z�S���Q\�56z�0h��x��Y4U���
���I�����
�[�W�^�m��C�vĦD�
+�Ψ���N���n6s�ێ��6.v�q���N����hܯ�����a+��}l����cȃ������v���F��ӣ����o����<t'��'���|���ef�~�/PK
+
+�@
+
+
+�;e{��e
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+*
�
+
+
+
+
+
\ No newline at end of file
Modified: branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
===================================================================
(Binary files differ)
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractUserData.java
2009-08-07 17:51:41 UTC (rev 5256)
@@ -64,6 +64,8 @@
protected long uiTime = 0;
protected long serviceTime = 0;
protected boolean notificationEnabled = true;
+ protected String topoNode = "urn:ogf:network:node";
+ protected String topoTag = topoNode;
/**
* Constructor
@@ -74,6 +76,32 @@
endpoints = new MAEndpointList(false);
qr = new QueryResponse();
}
+
+ public String getTopoNode() {
+ return topoNode;
+ }
+ public String getTopoTag() {
+ return topoTag;
+ }
+ public void setTopoNode(String topoNode) {
+ this.topoNode = topoNode;
+ setChanged();
+ notifyObservers();
+ }
+ public void setTopoTag(String topoTag) {
+ this.topoTag = topoTag;
+ setChanged();
+ notifyObservers();
+
+ }
+ public URI getURI() {
+ try {
+ return new
URI(String.format("%s=%s",getTopoNode(),getQuery(getTopoTag())));
+ } catch (Exception x) {
+ return null;
+ }
+ }
+
/**
* Clears query and response hashtables.
*/
@@ -327,9 +355,6 @@
qr.clearQuery();
}
- public URI getURI() {
- return null;
- }
}
class QueryResponse implements Cloneable {
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
2009-08-07 17:51:41 UTC (rev 5256)
@@ -1,7 +1,7 @@
log4j.rootCategory=INFO, console
log4j.category.org.perfsonar=INFO
-
+//log4j.category.org.perfsonar.lsclient=TRACE
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.console.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
2009-08-07 17:51:41 UTC (rev 5256)
@@ -1,9 +1,10 @@
log4j.rootCategory=DEBUG, file
-log4j.category.org.perfsonar.perfsonarui=DEBUG
-
-log4j.logger.org.apache.axis=ERROR
-
+//log4j.category.org.perfsonar.perfsonarui=TRACE
+//log4j.category.org.perfsonar.lsclient=TRACE
+//log4j.category.org.perfsonar.ri.lsclient=TRACE
+
+log4j.logger.org.apache.axis=ERROR
log4j.appender.file=org.apache.log4j.ConsoleAppender
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.File=${file.name}
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/Lookup.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/Lookup.java
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/Lookup.java
2009-08-07 17:51:41 UTC (rev 5256)
@@ -1,6 +1,5 @@
package org.perfsonar.perfsonarui.ls;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -12,7 +11,6 @@
import org.perfsonar.lsclient.data.TopologyElement;
import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.SmartMARequest;
-import org.perfsonar.perfsonarui.ma.MARequest_NMWG2;
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MetaDataList;
@@ -49,7 +47,8 @@
HashSet<TopologyElement> topoElements = new
HashSet<TopologyElement>();
topoElements.add(topoElement);
- HashSet<EventType> events;
+ HashSet<EventType> events = new HashSet<EventType>();
+ /*
Collection<EventType> eventTypes =
topoElement.getEventTypes();
if (eventTypes == null) {
events = new HashSet<EventType>();
@@ -59,15 +58,16 @@
events = new HashSet<EventType>();
for (EventType e : eventTypes) events.add(e);
}
-
+ */
HashSet<ServiceType> types = new HashSet<ServiceType>();
+ /*
types.add(new ServiceType() {
@Override
public String toString() {
return "MA";
}
});
-
+ */
process.addProcessListener(new
LookupProcess.ProcessListener() {
public void onStart() {
request.firePropertyChange(new
BusyIdleEvent(request,BusyIdleEvent.PROPERTY_MESSAGE,
@@ -93,13 +93,14 @@
endpoint.setDescription(service.getDescription());
endpoint.setContact(service.getOrganization());
endpoint.setEndpoint(service.getEndPoint().toString());
-
endpoint.setSchema(MARequest_NMWG2.NS_UTILIZATION_2_0);
-
endpoint.setEvent(MARequest_NMWG2.NS_UTILIZATION_2_0);
+
//System.out.println(service.getAuthorativeLookupservice());
+
//endpoint.setSchema(MARequest_NMWG2.NS_UTILIZATION_2_0);
+
//endpoint.setEvent(MARequest_NMWG2.NS_UTILIZATION_2_0);
endpoint.setDescription(service.getDescription());
topoElement.addEndpoint(endpoint);
StringBuilder b = new StringBuilder();
b.append("Found services for \t");
- b.append(topoElement.toString());
+ b.append(topoElement.getUiTime());
for (MAEndpoint e :
topoElement.getEndpoints()) {
b.append(e.getName());
b.append(',');
@@ -107,7 +108,7 @@
request.firePropertyChange(new
BusyIdleEvent(request,BusyIdleEvent.PROPERTY_MESSAGE,
"",b.toString()));
b.append("\tLookup service\t");
-
b.append(service.getAuthorativeLookupservice());
+
//b.append(service.getAuthorativeLookupservice());
logger.info(b.toString());
}
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/LSPlaygroundMainPanel.java
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/LSPlaygroundModel.java
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/MANIFEST.MFT
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/TopoElementLookupAction.java
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lsplayground/TopoElementPanel.java
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserData.java
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserData.java
2009-08-07 17:51:41 UTC (rev 5256)
@@ -19,16 +19,13 @@
*/
package org.perfsonar.perfsonarui.ma;
-import java.net.URI;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
-import org.perfsonar.lsclient.data.TopologyElement;
import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.TimeRange;
-import org.perfsonar.perfsonarui.ui.PerfsonarModel;
/**
* Adds some specifics for MA requests (in/out directions).
@@ -186,6 +183,7 @@
setQuery(names[INDEX_RESOLUTION], "300");
setResponse(names[INDEX_RESOLUTION], "300");
+ setTopoTag(C_IFADDRESS);
setChanged();
notifyObservers();
@@ -607,13 +605,6 @@
public void setNum(int num) {
this.num = num;
}
- public URI getURI() {
- try {
- return new URI("urn:ogf:network:node="+
getQuery(IUserData.C_IFADDRESS));
- } catch (Exception x) {
- return null;
- }
- }
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IUserData.java
2009-08-07 17:51:41 UTC (rev 5256)
@@ -32,6 +32,7 @@
*
*/
public interface IUserData extends Comparable<IUserData>,
Serializable,TopologyElement {
+ public static final String ogfPrefix = "urn:ogf:network";
public final static String C_HOSTNAME="hostName";
public final static String C_IFNAME = "ifName";
public final static String C_IFADDRESS = "ifAddress";
@@ -191,4 +192,9 @@
public Collection<EventType> getEventTypes();
public void setEventTypes(Collection<EventType> value);
public void addEventType(EventType value);
+
+ public String getTopoNode();
+ public void setTopoNode(String topoNode);
+ public String getTopoTag();
+ public void setTopoTag(String topoTag);
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
2009-08-07 16:30:41 UTC (rev 5255)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpoint.java
2009-08-07 17:51:41 UTC (rev 5256)
@@ -442,4 +442,8 @@
// TODO Auto-generated method stub
return 0;
}
+ public AuthorativeLookupservice getAuthorativeLookupService() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/TracerouteTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/TracerouteTest.java
2009-08-07 16:30:41 UTC (rev 5255)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/ls/TracerouteTest.java
2009-08-07 17:51:41 UTC (rev 5256)
@@ -2,16 +2,12 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.net.URI;
-import java.net.URL;
import junit.framework.TestCase;
-import org.perfsonar.lsclient.data.EventType;
-import org.perfsonar.lsclient.data.TopologyElement;
import org.perfsonar.perfsonarui.PSException;
+import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.SmartMARequest;
-import org.perfsonar.perfsonarui.ls.LSManager;
import org.perfsonar.perfsonarui.ls.Lookup;
import org.perfsonar.perfsonarui.ma.MARequest_NMWG2;
import org.perfsonar.perfsonarui.ma.UserData;
@@ -20,9 +16,8 @@
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MetaDataList;
-import org.perfsonar.perfsonarui.plugins.Metric;
-import org.perfsonar.ri.lsclient.level1.TopologyElements;
+
public class TracerouteTest extends TestCase {
/**
@@ -37,49 +32,25 @@
*/
protected void setUp() throws Exception {
-
- //testLS =
"http://loco4.man.poznan.pl:8080/xml-ls-global/services/LookupService";
- //testLS =
"http://sonar1.amsterdam.surfnet.nl:8080/xml-ls-home/services/LookupService";
super.setUp();
+ PSLogger.configureLog4j(false);
};
protected MetaDataList createQuery() throws Exception {
String[] ip = {
- "192.5.40.187",
- "212.191.224.74"
- /*
- "194.141.0.10",
- "212.191.224.18",
- "129.93.239.190",
- "198.49.208.15",
+ //"149.165.254.21"
+ //"130.59.37.101",//switch
http://rrdma.sonar.net.switch.ch:8180/geant2-java-rrd-ma/services/MeasurementArchiveService
+ //"rtr.kans.net.internet2.edu",
+ "10.165.2.4",
//http://ndb1.internet2.edu:9990/perfSONAR_PS/services/SNMPMA
+ //"192.16.166.30",
//r-s-starlight-fnal-dmz.fnal.gov
- "131.225.15.202",
- */
+ "150.254.185.146",// (PIONIER)
/*
- //ACAD
- "194.141.0.11",
- "62.40.125.65",
- //GN2
- "62.40.112.41",
- "62.40.112.46",
- //PIONIER
- "62.40.124.182",
- "212.191.224.238",
- "150.254.162.229",
- "150.254.185.146",
- //surfnet
-
- "145.145.80.42",
- "195.69.146.5"
- */
+ "192.5.40.187",
+ "212.191.224.74",
+ "194.141.0.10"// (BREN)
+ */
};
- /*
-
-http://rrdma.net.internet2.edu:8080/perfSONAR_PS/services/IUsnmpMA
-
-192.5.40.187
-149.165.227.249
- */
MetaDataList list = new MetaDataList(null);
for (int i =0; i < ip.length;i++) {
@@ -95,8 +66,8 @@
}
-
- public void test() throws Exception {
+ /*
+ public void xtest() throws Exception {
MetaDataList list = createQuery();
LSManager.getInstance(new
URL("http://perfsonar.acad.bg/psui_beta/MA.conf"));
Lookup l = new MockLookup();
@@ -111,6 +82,7 @@
//assertEquals("http://schemas.perfsonar.net/2.0",list.get(i).getEndpoint().getSchema().toString());
}
}
+ */
public void testNewLookup() throws Exception {
final Lookup lookup = new Lookup();
@@ -136,13 +108,13 @@
System.out.println(System.currentTimeMillis()-now);
for (int i=0; i < list.size();i++) {
- System.out.println(">>\t"+list.get(i));
+ System.out.println(">\t"+list.get(i).getURI());
for (MAEndpoint endpoint: list.get(i).getEndpoints())
System.out.println(">>\t"+endpoint);
}
}
-
- public void testSummarizedXml() throws Exception {
+ /*
+ public void xtestSummarizedXml() throws Exception {
String xml = TopologyElements.toSummerisedXml(new
TopologyElement() {
public URI getURI() {
try {
@@ -156,4 +128,5 @@
System.out.println(xml);
}
+ */
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2009-08-07 17:51:41 UTC (rev 5256)
@@ -2,11 +2,11 @@
Main-Class: org.perfsonar.perfsonarui.ui.PerfSonarApp
Class-Path: jars/axis/axis-ant.jar jars/axis/axis.jar
jars/axis/bcprov-jdk15-138.jar jars/axis/codec-1.0.jar
jars/axis/commons-collections-3.1.jar jars/axis/commons-discovery-0.2.jar
jars/axis/commons-lang-2.1.jar jars/axis/commons-logging-1.0.4.jar
jars/axis/edugain-1.0-RC2.jar jars/axis/javolution-3.7.jar
jars/axis/jaxrpc.jar jars/axis/joda-time-1.4.jar
jars/logging/log4j-1.2.15.jar jars/axis/opensaml-1.1.jar
jars/axis/opensaml-trunk-jdk-1.5.jar jars/axis/openws-trunk-jdk-1.5.jar
jars/axis/perfsonar-base-1.0.20080924.jar jars/axis/sasl-ca-1.0.jar
jars/logging/slf4j-api-1.5.5.jar jars/logging/jcl-over-slf4j-1.5.5.jar
jars/logging/slf4j-log4j12-1.5.5.jar jars/axis/velocity-1.5.jar
jars/axis/wsdl4j-1.5.1.jar jars/axis/wss4j-1.5.3.jar
jars/axis/xmlsec-1.4.1.jar jars/axis/xmltooling-trunk-jdk-1.5.jar
jars/dns/dnsjava-2.0.3.jar jars/swingx/swingx-0.9.5.jar
jars/ui/jcommon-1.0.16.jar jars/ui/jfreechart-1.0.13.jar jars/ui/junit.jar
jars/ui/swing-layout-1.0.jar jars/xalan/xalan-2.7
.0.jar jars/xalan/xalan-serializer-2.7.0.jar
jars/xalan/xerces-2.9.1-xercesImpl.jar jars/xalan/xerces-2.9.1-xml-apis.jar
jars/xml/commons-cli-1.0.jar jars/xml/jdom.jar jars/xml/mail.jar
jars/xml/xercesImpl.jar jars/xml/saaj-api-1.3.jar jars/xml/saaj-impl-1.3.jar
jars/xml/wstx-lgpl-3.2.7.jar jars/ls/activation-1.1.jar
jars/ls/LS-client-api-1.0RC2.jar
jars/ls/LSclient-Implementation-1.0-BETA2.jar jars/xml/stax-api-1.0.1.jar
jars/xml/jaxb-api-2.1.jar jars/xml/jaxb-impl-2.1.7.jar
Specification-Title: perfSonar test application
-Specification-Version: 0.15a
+Specification-Version: 0.15b
Specification-Vendor: perfsonar.acad.bg
Package-Title: org.perfsonar.perfsonarui
-Package-Version: 0.15a
+Package-Version: 0.15b
Package-Vendor: acad.bg
Implementation-Title: Perfsonar UI
-Implementation-Version: 0.15a
+Implementation-Version: 0.15b
Implementation-Vendor:
\ No newline at end of file
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2009-08-07 16:30:41 UTC (rev 5255)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2009-08-07 17:51:41 UTC (rev 5256)
@@ -276,7 +276,8 @@
"org.perfsonar.perfsonarui.flowsa.FlowsaMATab",
"org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel",
"org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab",
- "org.perfsonar.perfsonarui.lookingglass.LookingGlassTab"
+ "org.perfsonar.perfsonarui.lookingglass.LookingGlassTab",
+
"org.perfsonar.perfsonarui.lsplayground.LSPlaygroundModel"
};
for (String tabclass : tabs)
Added: branches/perfsonarui/src/plugins.lsplayground.classes
- perfsonar: r5256 - in branches/perfsonarui: ant jars/ls src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/ls src/org/perfsonar/perfsonarui/lsplayground src/org/perfsonar/perfsonarui/ma src/org/perfsonar/perfsonarui/plugins src/org/perfsonar/perfsonarui/test/ls src/org/perfsonar/perfsonarui/ui, svnlog, 08/07/2009
Archive powered by MHonArc 2.6.16.